deleted one line from orders.css
 fixed a merge conflict
angularjs navbar working right, removed turbolinks from public assets
Merge branch 'master' of github.com:daniellecs/project_craig