Merge branch 'master' of https://github.com/steventhomasmiller/National-School-of-Academic-Equitation

Conflicts:
functions.php
style.less
grunt and json
Merge branch 'master' of https://github.com/steventhomasmiller/National-School-of-Academic-Equitation

Conflicts:
	functions.php
	style.css
	style.less