updating images
bug fixes
Merge branch 'develop' of https://github.com/kdee15/astd into develop

Conflicts:
	assets/css/Stylesheet.css
Merge branch 'develop' into css_fixes

Conflicts:
	assets/css/Stylesheet.css
Merge branch 'develop' into css_fixes

* develop:
  events blocks
  building homepage
  image updates
  js

Conflicts:
	assets/css/Stylesheet.css
	assets/images/svg/bg-conference.svg
Merge branch 'develop' into css_fixes

* develop:
  image updates
merged stuff
image updates
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