Added a few small comments
Fixed merge conflicts, some very minor new comments and cleaning up
Added TextView to display messages between phone on-screen like an old-school chat client.