Merge branch 'master' of https://github.com/red-admirals-2014/littlepooper
need to update local master
need to update local master
removed line
testing
Merge pull request #34 from red-admirals-2014/trying_merge

Trying merge