Change https to http
New file architecture
Merge branch 'master' into facebook

Conflicts:
	index.html