trying to merge
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge remote-tracking branch 'origin/fixing_ingredients_view'
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'refactor_javascript'