dealing with merge issues
Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer
Fixed style merge issues

* added new sass variable names in place of old ones
Fixed controller merge issues

* added missing parentheses in main_controller
* added missing end in application_controller
Merge pull request #53 from keaty/master

Fixed style and controller merge issues