First Prototype
Merge branch 'master' of https://github.com/kurtstohrer/-GDD2project2

Conflicts:
	index.html