Edit .gitignore
Merge branch 'master' of https://github.com/MortenBirk/camp

Conflicts:
	.idea/misc.xml
Add WEKA jar to project