Adapting for testing
Merge branch 'master' of https://github.com/joshken/CIT261

Conflicts:
	index.html