Merge pull request #25 from YfLn/master

Updating Richard branch from master
Merge pull request #26 from YfLn/master

styled edit-profile
Changed "email address" field in edit profile from a text box to a label, as to imply it cannot be changed.
Merge pull request #28 from YfLn/master

Updating Richard branch from master
Merge branch 'Richard' of github.com:YfLn/CEN3031FA14 into Richard
Merge pull request #29 from YfLn/Richard

Updated "email adress" field in edit profile