blah
Merge commit '21bc2f4048c85515a51a65a56484d9ea3c549259' into backupA
reduce debug
Merge commit '25ed41db4a432dc78ee15980ca3bc587b7ba63e1' into backupA

Conflicts:
	src/src/edu/rit/acn/ccnTextConf/model/UserList.java
	src/src/edu/rit/acn/ccnTextConf/test/SimpleConfTest.java
Merge remote-tracking branch 'origin/backupA'

Conflicts:
	src/src/edu/rit/acn/ccnTextConf/model/TextConf.java
	src/src/edu/rit/acn/ccnTextConf/model/UserList.java
	src/src/edu/rit/acn/ccnTextConf/test/SimpleConfTest.java