Files changed
Merge branch 'master' of https://github.com/brandoncc94/Galaga

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