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