Update gemfile and application.rb
Delete model
back to reality
Merge branch 'awesomejob' of /home/git/repositories/digidentity-academy/lisanne-reservations
schema update
Generate Devise views, remove attr_accesible
change route file and add alert notice
Apply comments from merge request usermodel
Adding static_pages controller and haml view docs
Merge branch 'usermodel' of /home/git/repositories/digidentity-academy/lisanne-reservations
Commit application.html.haml because of merge conflict
Create homepage and install bootstrap
Merge branch 'homepage' of /home/git/repositories/digidentity-academy/lisanne-reservations