test
web
test
test edit
test edit
test edit
test
test

Conflicts:
	content-page.php
	css/editor-style.css
Merge pull request #10 from brandhatchery/dev

Dev