review boxes done
tiny chane
Merge branch 'erb_frame'
Merge branch 'erb_frame'

* erb_frame:
  review boxes done
Merge branch 'erb_frame'

* erb_frame:
  tiny chane
activity bar styled
view section fixed
Merge branch 'show_section' of github.com:xianny/guide-dog into show_section

* 'show_section' of github.com:xianny/guide-dog:
  view section fixed
  activity bar styled
updated seeds file, merged chris's erb
saturday morning commit
Merge branch 'show_section'
activities will update author tags on save
Merge branch 'bug_slow'

* bug_slow:
  activities will update author tags on save
updated changes sat night
explore functions and form working
Merge branch 'master' of github.com:xianny/guide-dog

* 'master' of github.com:xianny/guide-dog:
  updated changes sat night
  saturday morning commit
Merge branch 'new_erb_search'

* new_erb_search:
  explore functions and form working
edits to submit new parameters
awweeeesome
Merge branch 'awesome-time'

* awesome-time:
  awweeeesome