added selectRoomActivity and ChatRoomActivity
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/realtalk/activities/MainActivity.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/realtalk/util/Message.java
Merge branch 'master' of https://github.com/realtalk403/realtalk
updated chatroom ui
Merge pull request #2 from realtalk403/master

Update Fork-repo
Integrated logo, updated UI, added pop up dialogs.
updated chatroom ui
Made it fullscreen.
Merge pull request #31 from blee92/master

Updated UI
Few more UI changes.  Made Create Account full screen and title bigger.
updated chatroom ui
AlertDialog variable names changed
Merge pull request #34 from blee92/master

Small UI changes + hungarian
Merge pull request #35 from taylorsw/master

updated cri and fixed bug in ChatManager's call to addRoom
Merge branch 'master' of https://github.com/realtalk403/realtalk

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
	src/realtalk/activities/MainActivity.java
Merge pull request #3 from realtalk403/master

Update Repo
Added UML Sequence Diagrams and Directory for SRS
Merge pull request #37 from colinkho/master

Set Up Alpha release document directory and added UML Diagrams
Added UML server class diagram