Updated our coffee page
Merge branch 'master' of github.com:cbar09/commonwealth-joe

* 'master' of github.com:cbar09/commonwealth-joe:
  Updated gem file
  committing changes to try to get assets loading
Updated gemfile and fixed div on our-coffee page