changed test_index to index
Merge branch 'master' of github.com:andrewwhe/hackgt2014

Conflicts:
	extension/app/index.html
lol