more
Merge branch 'master' of heroku.com:diegotakacs-com

Conflicts:
	index.html