let's call it let's vegas
Merge branch 'develop' into staging

Conflicts:
	index.html
removed old index
Merge branch 'develop' into staging
Let's call Let's Vegas