removed
Merge branch 'animate'

Conflicts:
	style/css/style.css
	style/scss/style.css
index updated to match mindmap
Content created

now to edit