Merge branch 'master' of https://github.com/lukszar/jsfrestaurants.git