Starting to model things
Merge branch 'master' of github.com:tebriel/js_bistro_octopus
Merging us