Merge pull request #2 from andreqi/master

update dev
menu block update
add file css, move js to footer
better and better
launch server using npm start
Merge pull request #3 from andreqi/jc

menu block update, style css, move js to footer
Merge remote-tracking branch 'origin/master' into single_restaurant

Conflicts:
	views/header.html