changes to flex slider
Merge branch 'master' of github.com:jayperryworks/petting-zoo

Conflicts:
	_includes/js/app.js
	assets/js/app.js