set up models, login, started on basic flow
merged some conflicts in views and urls