separate branch
wq
Merge branch 'master' of https://github.com/xblaster/QuickCooking

Conflicts:
	src/app.js
fix issue
Merge branch 'master' of https://github.com/xblaster/QuickCooking
Merge branch 'master' of https://github.com/xblaster/QuickCooking
Merge branch 'master' of https://github.com/xblaster/QuickCooking