fixes checkin form to add to database
resolved conflicts
user account page and cross-site navbar