First exercise
Merge branch 'master' of github.com:halhelms/thoughtbot