README
Merge branch 'master' of github.com:andreacfm/acts_as_assets

Conflicts:
	README.md