Merge remote-tracking branch 'james/master'
* we're starting to get annoyed by Jame's commits!
Conflicts:
	src/index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
added js file