some simple changes
123
2333
11
Merge branch 'master' of
https://github.com/jdyoungs/AugmentedChatProject

Conflicts:
	Augmented Chat/.classpath