addressing merge conflict
Merge branch 'master' of https://github.com/gopher-snakes-2013/team-schnitzel-2.0
Addresses merge conflict
setup rspec environment