testing git commit/testing bootstrap
Merge branch 'master' of https://github.com/CS411/cs411_project

Conflicts:
	index.html
Updated index.html
Merge branch 'master' of https://github.com/CS411/cs411_project