fixing homepage + tinymce uploads
lots template building and some css
blocks
Merge branch 'css_fixes' into develop

* css_fixes:
  image updates
  merged stuff
  bug fixes
  updating images

Conflicts:
	assets/css/Stylesheet.css
	assets/images/svg/astd-wordcloud.svg
	assets/images/svg/bg-header2.svg
	assets/images/svg/bg-ourlogo.svg
css & member page
expanding structure
homepage css cleanup
homepage css cleanup
nav cleanup
park
trello updates
footer
footer
footer
quotes
Merge branch 'develop' of https://github.com/kdee15/astd into develop
quotes
image updates
HOMEPAGE CSS cleanup
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