all cucumber tests green, except one, because that's a test for the search function that hasn't been completed yet
Merge branch 'master' of github.com:StephanMusgrave/ProjectX