test coding
Merge branch 'gh-pages' of https://github.com/Patterson-Roy/Team4-W14-CIT261 into gh-pages

Conflicts:
	index.html