parallax yo
no message
Merge branch 'master' of https://github.com/Vincentvjj/info343Final

Conflicts:
	.DS_Store
	Stories/Chapin/index.html
no message
Merge branch 'master' of https://github.com/Vincentvjj/info343Final

Conflicts:
	.DS_Store