Merge branch 'master' of C:\Users\Atheesan\Documents\KdG_3\SoftwareDevelopment\Git\GroepG with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/index.html
Edit Profile - update