before pulling
Merge branch 'master' of https://github.com/rgallison/Brainstormy
before deleting unneeded spec file
with cucumber and rspec tests