major update
Merge branch 'master' of https://github.com/oldsouless/super_gharp

Conflicts:
	public/index.html