added marionette to the applicaiton.[finishes #78336306]
Merge branch 'master' into backbone

grabbing changes from the master branch and mergeing them into backbone branch
removed duplicate folder
Merge branch 'master' of https://github.com/Aminoize/aminoize into backbone

merging food model and controller into backbone branch so i can have data to work with.
merging js and routes to the master branch
merging upstream changes