edited landing page view
edited user signup form
edited views for user login form and edit user form
resolved conflicts on merge