Initial Commit
Merge branch 'master' of https://github.com/angelajholden/blackorchid

Conflicts:
	front-page.php
	functions.php
	header.php
	js/global.js
	js/global.min.js
	scss/_base.scss
	scss/style.scss
	style.css