organise
Merge branch 'master' of https://github.com/siddharthbhargava/ChatoverCloud

Conflicts:
	ChatWorkspace/.metadata/.log

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Ch
atoverCloud/.indexes/2/history.index

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Ch
atoverCloud/.markers

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Ch
atoverCloud/.markers.snap

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.projects/Ch
atoverCloud/.syncinfo.snap

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.root/.index
es/properties.index

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.root/.marke
rs.snap

ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/o
rg.eclipse.core.resources
	ChatWorkspace/.metadata/.plugins/org.eclipse.core.resources/.snap
	ChatWorkspace/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	ChatWorkspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

ChatWorkspace/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache
.properties

ChatWorkspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_setting
s.xml

ChatWorkspace/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xm
l

ChatWorkspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsT
imeStamps

ChatWorkspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/12344
95815.index

ChatWorkspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/indexes/saved
IndexNames.txt

ChatWorkspace/.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndC
ontainers.dat