the awesome
buddy page
merged conflict
Merge branch 'master' of https://github.com/simplereach/buddybuddy

* 'master' of https://github.com/simplereach/buddybuddy:
  styling stuff