minor edits
Merge branch 'master' of github.com:ambertunnell/worldview
adds photos and articles controllers