workshop setup
Merge branch 'master' of github.com:madison-college-rails/git-workshop-spring-2014