Day3 update
update
Day3 update
Merge branch 'master' of https://github.com/jbcon/Promotion

Conflicts:
	Promotion/res/images/Day2/Day2BG.png
	Promotion/src/resource.js
Merge branch 'master' of https://github.com/jbcon/Promotion