park
Merge branch 'develop' of https://github.com/kdee15/astd into develop

Conflicts:
	assets/css/Stylesheet.css
	assets/css/Stylesheet.css.map
	assets/css/site/base/_site.scss