css varios
Merge branch 'master' of https://github.com/davidcaro/demoteros-app

Conflicts:
	template/profile.html