snyggare bilder, rensat bort onödigt
Merge remote-tracking branch 'origin/master'

Conflicts:
	gameobject.cpp
	gameobject.h
	main(new).cpp
Merge branch 'master' of https://github.com/emzzie93/galaxen