Test
Merge branch 'develop' into staging
Fixed indec
Conflicts:
	index.html
Added newline
Merge branch 'develop' into staging