Set-up EasyMock Framework
Added Mock Tests for ChatController
Merge branch 'master' of https://github.com/realtalk403/realtalk
Deleted UserManagerTest.java
Merged Files
Merge branch 'master' of https://github.com/realtalk403/realtalk
Merge branch 'master' of https://github.com/colinkho/realtalk
Adjust tests to be more accurate and cleaned up
Merged from hazarij
Merge branch 'master' of https://github.com/realtalk403/realtalk
Cleaned up tests and checked coverage
Cleaned up tests and checked coverage
Merge branch 'master' of https://github.com/realtalk403/realtalk
Cleaned up activity tests
Merge pull request #148 from CoryShiraishi/master

Tests for creating rooms and emoticons
Merge branch 'master' of https://github.com/realtalk403/realtalk
modified format of ChatRoomActivityTest
Added change password into the existing test
Merge pull request #149 from blee92/master

Added change password into tests
Merge branch 'master' of https://github.com/realtalk403/realtalk