Merge branch 'master' of https://github.com/wramirez09/dev.mycallfromsanta

Conflicts:
css/app.css
conflict resolved
Merge branch 'master' of https://github.com/wramirez09/dev.mycallfromsanta

Conflicts:
	css/app.css