added cucumber
acceptance test 4 inproceedings
Merge branch 'master' of github.com:CandB/munanashampurilainen