changed navbar color
Merge branch 'master' of https://github.com/rayhaoray/eatDemo into dbd
updated ui for alpha
Merge branch 'master' of https://github.com/rayhaoray/eatDemo into dbd

Conflicts:
	views/detail.jade