Conflicts:
	README.md
	bower.json
	component.json
	jquery.velocity.js
	jquery.velocity.min.js
	package.json
	velocity.ui.js