add database.yml to gitignore
change aplication.css to scss
add devise
fix conflicts
delete artefacts after fixing conflicts
now devise form appear in center of display