Did absolutly nothing
Merge branch 'master' of https://github.com/Ourobor/petulant-batman

Conflicts:
	javaproject/bin/Study/StudyBuilder.class
added crc cards