zombies can now infect players7
Merge branch 'master' of github.com:llamadigital/zombies

Conflicts:
	app/controllers/players_controller.rb
	db/schema.rb