Installed and configured Devise and setup Pages controller
fix merge conflict
Merge branch 'devide'