modified format of ChatRoomActivityTest
Merge pull request #150 from colinkho/master

Added Mock Tests and clean-up tests.
comments
comments
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	src/realtalk/controller/ChatController.java
	tests/src/realtalk/activities/ChatRoomActivityTest.java
comments
Merge pull request #154 from hazarij/master

Added comments to ChatRoomActivityTest
Sleep for jenkins added
Sleep for jenkins added
Complied to CheckStyle Standards