1
1
1
1
1
hi
Merge remote-tracking branch 'origin/Saulius' into Saulius

Conflicts:
	Augmented Chat/.classpath
	Augmented Chat/.project
	Augmented Chat/.settings/org.eclipse.jdt.core.prefs
	Augmented Chat/.settings/org.eclipse.m2e.core.prefs
	Augmented Chat/pom.xml
	Augmented Chat/src/test/ChatTest.java
Merge branch 'Saulius'

Conflicts:
	Augmented Chat/.classpath