Fix things
Merge branch 'master' of https://github.com/Belgarion/sputnik

Conflicts:
	src/Entities/Player.java
	src/main/Main.java