added all data
Merge branch 'master' of https://github.com/ayoung01/cs171

Conflicts:
	project2/website/tests/index.html