last spot

last spot
Merge branch 'master' of https://github.com/Vexil/EllipseSG

Conflicts:
	src/main/java/net/dtnk/EllipseSG/Game/Game.java
Commit
Commit
Merge branch 'master' of https://github.com/Vexil/EllipseSG