Initial re-commit
Merge branch 'master' of https://github.com/Clark-Nikdel-Powell/Lepidoptera

Conflicts:
	admin.php
	css/style.css
	functions.php
	sass/style.scss
Ignore compiled CSS