For the demo
Merge branch 'master' of https://github.com/rmmccann/CS323-Project-Prototype

Conflicts:
	style.css