committing before merging
Merge branch 'master' of https://github.com/dyarosla/mathbacon

Conflicts:
	mathbacon/templates/index.html