erratic protestors
Merge branch 'master' of github.com:AndrewGroupofCompanies/TOJam9

Conflicts:
	entities.js
	main.js