Add rails generate devise:views
install simple_form
bootstrap install
install foundation 5
Fix merge conflicts