pre merge
Merge branch 'master' of https://github.com/dyarosla/mathbacon

Conflicts:
	css/bootstrap.min.css
	css/index.css
	css/normalize.css
	css/start.css