conflict
Merge branch 'master' of https://github.com/Simm033/WBA2_Phase2.git

Conflicts:
	WBA2_Phase2/src/webservice/ProfileService.java