merge
Merge branch 'master' into pooper
added poop count
fixed merge conflict
Merge pull request #65 from red-admirals-2014/pooper

Pooper