Merge pull request #1 from ckampfe/ch1

Ch1
Merge pull request #2 from ckampfe/ch2

Ch2
cucumber intro
remove bad spec