working on toggling dashboard
fixed conflict
fixed conflicts
added footer to homepage
Merge branch 'development' of github.com:climbingcode/bam- into development
added footer
fixing layout on brand page
fixed conflict in gemfile
Merge branch 'development' into form_modals
working on collapsible dashboard
fixed conflict