various css tweaks
fixed merge conflicts
its the final push do do do duuu duu de du
Merge branch 'development' of https://github.com/ericfrommelt/retreat_app into development