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

Conflicts:
	SlickMultiStateTemplate/.classpath
trying to fix my ignore
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git

Conflicts:
	SlickMultiStateTemplate/.gitignore