angularjs navbar working right, removed turbolinks from public assets
Merge branch 'master' of github.com:daniellecs/project_craig
uncommented out a line, also sorry didn't mean to be on master right now
Merge branch 'master' into chelsea
fomrat updates to teh search results and home page for images
Merge branch 'master' of github.com:daniellecs/project_craig
Merge branch 'master' of github.com:daniellecs/project_craig
Merge branch 'master' into chelsea