GHFG
Merge branch 'master' of https://github.com/borislav-draganov/Asteroids

Conflicts:
	mainwindow.cpp