main.py changes
Merge branch 'master' of http://github.com/meet-projects/friendsfortour-y3-2014