see if this works chad
Merge branch 'master' of https://github.com/cmd1209/DAH_Wordpress

Conflicts:
	themes/DAH-HTML5/footer.php