fixing zombies
Merge branch 'master' of github.com:paulaluri/Feuds