Changed mainly user.php, added in login bar to top of some pages
Merge branch 'master' of https://github.com/hcuri/Team5