fixed bugs
Merge branch 'master' of github.com:woolly-bear-caterpillars-2014/polar-bear-panic
Merge pull request #15 from ryanstorberg/master

bug fixes