troll
troll

Conflicts:
	README.md
Merge branch 'master' of http://github.com/BTS-SIO2-2013/ZombieKiller