web server function complete
Merge branch 'master' of https://github.com/IEMS5718/PrivSocial

Conflicts:
	Profile.html