commiting to pull
Merge branch 'development' of github.com:AdamGoodApp/cheerup into development
stylesheets, sessions controller, application layout
conflicts resolved