final
Merge branch 'master' of github.com:abhishek85bansal/ByThePublic

Conflicts:
	web/index.html