Added a very basic Profile page
fixed merge issues
Merge branch 'master' of https://github.com/umfoida5/comp4350group5
Create a basic design for the the Profile page
Merge branch 'master' of https://github.com/umfoida5/comp4350group5