Merge
Merge branch 'master' of https://github.com/yepesasecas/golazzos2

Conflicts:
	app/assets/.DS_Store