New gherkin tests.
Merge branch 'delebota' of github.com:alephtwo/cs485 into delebota