Transitions!
Merge branch 'master' of https://github.com/RichardGomer/waisKololaVis

Conflicts:
	index.html
	js/slide_feature.js