Merge pull request #4 from anilkagak2/master

mearging
-Map added
Merge remote-tracking branch 'Anil Kag/master'
Merge remote-tracking branch 'Gupta/master'

Conflicts:
	build/classes/server/AddEvent.class
	build/classes/server/ChangePassword.class
	build/classes/server/Register.class
	src/server/AddEvent.java
	src/server/ChangePassword.java
	src/server/GetEvents.java