Acoplando codigo otra ves
Acople
Merge branch 'master' of https://github.com/BADSA/GALAGA

Conflicts:
	Allegrito.layout
	src/main.h
	src/objects.c
	src/objects.h
Acople 2