resolved conflict devise parameters
Merge pull request #4 from ljdegastines/add_controllers

resolved conflict devise parameters