I think my part is done, let me know if you see anything else
Merge branch 'master' of github.com:kloplop321/cs256

Conflicts:
	index.html