Delete extra stuff from index.html
Merge branch 'master' into angular

Conflicts:
	index.html
Load angular at the bottom of the HTML file