init
ignore:
+.classpath
+.project
+.settings
+target
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore