Merge my stuff
fuck git
Merge branch 'master' of https://github.com/yksikaksikolme/CollegeCrawl

Conflicts:
	CollegeCrawl/bin/Minigames/BugHunt/BugHuntCore.class