working test
cucumber
Merge branch 'master' of https://github.com/Klopsch/finalproject
Merge branch 'master', remote-tracking branch 'origin' into lacoste
passing cucumber tests