adding modals
adding modal styles
fix
Playing with modals, late night
Git down with the confilcts
conflict fix
styling
modals working
Devise styles and login
Styles stuff for login
fix conflicts with david
fixing francesca conflicts
minor edits