moran main.py changes
fixing merge conflict
worked on connecting
Merge branch 'master' of http://github.com/meet-projects/friendsfortour-y3-2014
button to chat
button