Changed webservice so that you don't have to add /index.
Merge remote-tracking branch 'origin/master'

Conflicts:
	code/src/webservice.py