Merge branch 'master', remote-tracking branch 'origin' into lacoste
rspec
base rspec tests
better spec tests
Merge branch 'master' of github.com:Klopsch/finalproject