Bad fps feex

Some other feexes too.
Conflict fix

Conflicts:
	Hanfeldt Game/src/com/hanfeldt/game/Main.java