update .gitignore
Signed-off-by: Kazuki Kubo <kz@assaulter.org>
Merge branch 'master' of github.com:assaulter/scalaProjects

Conflicts:
	conscription/.idea/encodings.xml
	conscription/.idea/highlighting.xml
	conscription/.idea/libraries/SBT__org_scala_lang_scala_library_2_10_0.xml
	conscription/.idea/libraries/SBT__org_specs2_scalaz_concurrent_2_10_7_0_0_test.xml
	conscription/.idea/libraries/SBT__org_specs2_scalaz_core_2_10_7_0_0_test.xml
	conscription/.idea/libraries/SBT__org_specs2_scalaz_effect_2_10_7_0_0_test.xml
	conscription/.idea/libraries/SBT__org_specs2_specs2_2_10_1_13_test.xml
	conscription/.idea/libraries/SBT__scala_2_10_0.xml
	conscription/.idea/libraries/SBT__scala_2_9_2.xml
	conscription/.idea/misc.xml
	conscription/.idea/modules.xml
	conscription/.idea/projectCodeStyle.xml
	conscription/.idea/scala_compiler.xml
	conscription/.idea/vcs.xml
	conscription/.idea_modules/conscription-build.iml
	conscription/.idea_modules/conscription.iml

Signed-off-by: Kazuki Kubo <kz@assaulter.org>