rebuilding db to fix carrierwave gem error
fixing gems error
adding more notes files
adding notes for photoshow page, changing photoshow page to haml
adding haml structure for photoshow page
adding show comments section
adding add a comment form to photo show page
adding rejection of blank comment functionality
fixing form duplication in add a comment form
adding destroy comment buttons to the view
redirecting destroy comment to photoshow page
adding edit comments form, working apart from assigning user_id to comments, same issue as new comment form
rearranging notes folder
changing photonew form from nested to normal form, removing nested edit form and accepts nested attributes stuff
adding working new comments form on photoshow page
joyfully, adding an edit comment form
Merge branch 'master' of github.com:emmaviolet/photo_sharing_app

Conflicts:
	photo_sharing_app/Gemfile
Merge branch 'photoshow'
bullied into commiting by git