inserted ui elements into banterRoomLayout
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/Banter/BanterActivity.java