restructured application -- needed to be simpler
merging because of a tab...
Merge branch 'master' of https://github.com/mturbe/glowing_octo_robot