Bonus added.
Merge branch 'master' of https://github.com/brandoncc94/Galaga

Conflicts:
	build-ProyectoGalaga-Desktop-Debug/mainwindow.o