trying to merge
javascript refactored
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 into refactor_javascript
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'refactor_javascript'
Merge pull request #45 from fiery-skippers-2014/refactor_javascript

Refactor javascript