updated
updated index
updated
Merge branch 'staging'

Conflicts:
	.idea/workspace.xml
	index.html
Merge branch 'master' into develop
reveised index