no message
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype

Conflicts:
	index.yaml
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype
no message
Merge branch 'master' of https://github.com/clnye15/CS-Final-Project-Prototype