Merge branch 'master' of github.com:trvrfrd/trvrgur
fix user has_many associations
fix typo in AlbumsController
bundle update
properly nest child comments YOWZERZ
create comments#show; add replies via show page
fixed rendering comment#new after failed comment creation
Merge branch 'comments'