Merge branch 'master' of https://github.com/NicholasHanemann/team9-project3

Conflicts:
	app/views/home/index.html.slim
Merge branch 'master' of https://github.com/NicholasHanemann/team9-project3

Conflicts:
	app/views/home/index.html.slim