Merge branch 'master' of https://github.com/bigmikestudios/bms-barebones

Conflicts:
	functions.php
fixed functions conflict