new ting
Merge branch 'master' into benjiBranch

Conflicts:
	index.html
Merge pull request #11 from FC-Chaps/benjiBranch

Benji branch