fixing shit
Merge branch 'master' of github.com:beachygreg/zapoc

Conflicts:
	public/index.html