Henley Changes
Merge branch 'master' of https://github.com/kishandchips/henley

Conflicts:
	css/style.css
	functions.php