Merge branch 'driley' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	index.html