.
Merge branch 'master' of github.com:andkem/Space-Pong

Conflicts:
	docs/Tidsrapport.txt
	src/Space-Pong/gameengine.cpp