fix
Merge branch 'master' of https://github.com/LigeiaRowena/SmartApp

Conflicts:
	.DS_Store