Merge pull request #234 from nhaarman/2.x-cleanup

Restructure methods into files

Author: nhaarman

.gitignore

@@ -6,5 +6,15 @@ out/
 !gradle-wrapper.jar
 *.iml
 
-.idea/
-!/.idea/codeStyleSettings.xml
+.idea/caches/*
+.idea/compiler.xml
+.idea/gradle.xml
+.idea/kotlinc.xml
+.idea/libraries/*
+.idea/misc.xml
+.idea/modules.xml
+.idea/runConfigurations.xml
+.idea/shelf
+.idea/uiDesigner.xml
+.idea/vcs.xml
+.idea/workspace.xml

.idea/codeStyles/Project.xml

@@ -1,26 +1 @@
-#
-# The MIT License
-#
-# Copyright (c) 2016 Niek Haarman
-# Copyright (c) 2007 Mockito contributors
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-isRelease = false
+isRelease=false