try to fix
trying to readd
make this work
second try to finish layout and routes
fix conflicts
make a basic user model