made karma work
Merge branch 'master' of github.com:beachygreg/zapoc

Conflicts:
	public/app/scripts/SurvivorSidebarController.js