merge
Merge branch 'master' of https://github.com/kubalaj/kayakclub2013
Merge branch 'master' of https://github.com/kubalaj/kayakclub2013
Mark's cucumber tests