Merge branch 'master' of https://github.com/jason482/hackTheMidwest

Conflicts:
	templates/index.html
	templates/main-template.html
Another attempt to merge…grrrrrr
Merge branch 'master' of https://github.com/jason482/hackTheMidwest

Conflicts:
	templates/index.html
	templates/main-template.html