Merge remote-tracking branches 'origin/master' and 'origin/ui_implementation'
Merge branch 'ui_implementation'
Removed error causing lines from spec.
Merge branch 'master' of https://github.com/matt423/wild_camping into ui_implementation