Cleaned up violations.
Merge branch 'master' of https://github.com/godzirra/squirt-gun

Conflicts:
	index.html