Initial feature 1 commit
Merge remote-tracking branch 'origin/feature-2' into develop

Conflicts:
	index.html
Tidying features for release
Merge branch 'release-0.1'

Conflicts:
	index.html