fix
Merge branch 'master' of github.com:hirish/trolley

Conflicts:
	static/index.html