Merge branch 'master' of https://github.com/pabloppp/Albondiga-GameJamUA

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/pabloppp/Albondiga-GameJamUA