added the JetBrains settings files to repo
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Changed from devise 3.0.0 to 3.0.1
Merge remote-tracking branch 'origin/master'
Changed from devise 3.0.0 to 3.0.1