Add transition between page
Merge branch 'master' of https://github.com/zekewang918/QuitSmoking

Conflicts:
	welcome.php