fix merge conflict
devise views
Gemlock conflict
Merge pull request #4 from cdcueva/setup

Setup