preparing to merge
Merge branch 'master' of https://github.com/rgallison/Brainstormy
fixed routes to reflect changes