Head
Merge branch 'master' of heroku.com:elobjetivista

Conflicts:
	app/templates/base2.html
Foundations