merge changes
Merge branch 'master' of https://github.com/decwong/Cocooned
fixed swiping effect
Merge branch 'master' of https://github.com/decwong/Cocooned

Conflicts:
	Cocooned/level1.lua