Algunas cosicas
Merge branch 'master' of https://github.com/aydevosotros/LastGodMachine.git
bp
done!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
Merge branch 'master' of
https://github.com/aydevosotros/LastGodMachine.git

Conflicts:
	FinalGodMachine/GodMachine.h
	FinalGodMachine/Makefile