fixed profile page, added back to edit profile. Tried to add '@middlebury.edu' at the end of signup but there is something wrong with the allignment of it. need to figure it out
fixed conflicts