Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Merge pull request #90 from keaty/master

front end UI features