add error catching
Merge branch 'controller' into dev
Merge branch 'View' into dev
Editing "editProfile" reports and _Layout.cshtml