merge
Merge branch 'new_animations' of https://github.com/katiekovalcin/kovalcin into new_animations

Conflicts:
	_site/css/global-unprefixed.css
	_site/css/global-unprefixed.css.map
	_site/css/global.css
	css/global-unprefixed.css
	css/global-unprefixed.css.map
	css/global.css
merge
adding images