some changes
Merge branch 'master' of github.com:GustavoCaso/Maximiliano

Conflicts:
	.DS_Store
	app/.DS_Store