test commit from Cloud9
Merge branch 'master' into pr/12

Conflicts:
	index.html