bones theme and branch
Merge branches 'bonetheme' and 'master' of https://github.com/admecoach/WordPress-Skeleton

Conflicts:
	content/themes/bones