animation!!!
Merge branch 'master' of https://github.com/jbcon/Promotion

Conflicts:
	Promotion/src/resource.js