Some conceptualist work again!
Merge branch 'master' of https://github.com/qmpzaltb/cleansanity.git

Conflicts:
	Cleansanity/src/saneMain/Cleansanity.java