adding carousels
Merge branch 'master' of github.com:YeomanTO/yeomanto.github.io

Conflicts:
	_posts/2014-05-02-may-2014-workshop-recap.md
	assets/less/style.less
	assets/style.css