Updating.
Merge branch 'master' of https://github.com/ThomasAlexanderShirley/the-sweetest

Conflicts:
	animate.html