preparing to merge
Merge branch 'master' of https://github.com/rgallison/Brainstormy
preparing to merge
passing Colin's rspec and cucumber tests