test version
Merge branch 'master' of github.com:KemingChen/JuMeFood
Merge branch 'master' of github.com:KemingChen/JuMeFood

Conflicts:
	js/app.js