1
Merge branch 'master' of github.com:meathill/animate.css

Conflicts:
	animate-config.json
	animate.css
	animate.min.css
	source/_base.css
	source/sliders/slideInUp.css