commit before trying to fix devise
Merge branch 'development' into devise_stuff
devise finally working, can now edit user