final changes
Merge pull request #57 from pocket-gophers-2014/refactored

Refactored
Merge pull request #58 from pocket-gophers-2014/demo

Demo
Merge branch 'master' into demo
removed cosmetic change for presentation