Playing with modals, late night
Git down with the confilcts
Devise styles and login
Styles stuff for login
fixing francesca conflicts