test commit to my branch
no message
the highlighted favorite button has arrived and is going to be the life of the party.
Merge remote-tracking branch 'origin/Dan_Branch' into Suneil_Branch

Conflicts:
	www/partials/explore.html
	www/partials/tours.html