angularjs navbar working right, removed turbolinks from public assets
Merge branch 'master' of github.com:daniellecs/project_craig
Merge branch 'master' of github.com:daniellecs/project_craig