Jackie - pushed
Merge branch 'master' of https://github.com/sgalindo/chtideachallenge

Conflicts:
	wp-content/themes/challengeCHT/page.php