some small changes in activity_banter
Merge branch 'master' of https://github.com/jamesfebin/roboboutline

Conflicts:
	app/src/main/res/layout/activity_banter.xml
Merge branch 'master' of https://github.com/jamesfebin/roboboutline