I changed it. Duh.
Merge branch 'feature-shared' of https://github.com/madison-college-rails/git-workshop-spring-2014 into feature-shared