index.html
Merge branch 'master' of github.com:roaringsheep/clawFront

Conflicts:
	client/index.html
make master clean so can switch branches