save for pull
fixes merge conflict
tweaks
Merge branch 'master' of github.com:ambertunnell/worldview
adds navbar and creates user show
fixes merge conflict
improves nyt api news