some basics
Merge branch 'master' of https://github.com/robotagmedia/french-restaurant
Merge branch 'master' of https://github.com/robotagmedia/french-restaurant