ajustes
Merge branch 'master' of https://github.com/Falotico/app

Conflicts:
	css/font-awesome.min.css