a little editing
added user login and a few other details
fixed conflicts
Merge branch 'jeremy_working2'