old changes
Merge branch 'master' of https://github.com/rclay83/368-final

Conflicts:
	css/styles.css
	index.html