Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
Merge remote-tracking branch 'james/master'

Conflicts:
	src/index.html
fixed  merge error