made changes to architecture
Merge branch 'master' of https://github.com/KayJayOkay/GrapeVine.git

Conflicts:
	GrapeVine/UDP chat program/server/User.java