commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
Merge branch 'master' of ssh://git@github.com/paragjain16/Gossip.git
Adding gitignore file