we
Merge branch 'VladimirsBranch'

Conflicts:
	TourPilot/bin/classes/.gitignore