removed conflict code
Merge branch 'master' of https://github.com/earthlinkdesign/calypso

Conflicts:
	wp-content/themes/html5blank-stable/page-travel.php
	wp-content/themes/html5blank-stable/page.php