git page
Merge branch 'gh-pages' of github.com:Onefox/iggcgj14TeamGreen into gh-pages

Conflicts:
	index.html