new change
Merge branch 'master' of https://github.com/leftarrow/sydney_tour

Conflicts:
	css/main.css
	protected/controllers/TourController.php