most of the login stuff plus a div for allen
merged gem conflicts, done most of the login stuff and aded a div for allen