Added users ettings page, fixed header links
Merge pull request #24 from COSI236TA/integrate

Added users ettings page, fixed header links