asdfasdf
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git

Conflicts:
	SlickMultiStateTemplate/src/com/generic/Core.java