merging
Merge branch 'master' of https://github.com/andrew-reece/cs171-final-project

Conflicts:
	andrew/main.css
	andrew/main.html
	andrew/main.js
Merge branch 'master' of https://github.com/andrew-reece/cs171-final-project