ControllerBase added
Merge branch 'master' of https://github.com/cryser29/SmashTheEvil

Conflicts:
	SmashTheEvil/SmashTheEvil.xcodeproj/project.pbxproj