Rachel - added comments and changed edit_profile to edit_user.haml
Merge branch 'master' of https://github.com/rgallison/Brainstormy
trying to sync with master
trying to sync with master, resolving a conflict