Merging diagrams
Change transition animation
Merge branch 'master' of https://github.com/nwilde97/demo.git

Conflicts:
	assets/css/site.css