Fixed my own login issues
Merge some of charle's work
Merge https://github.com/glittergallery/GlitterGallery into charlesx2013-myMaster
Merge pull request #83 from rohitpaulk/userfix

Fixed logout action to user session[:current_user_id]
Merge pull request #88 from rohitpaulk/duplicate-comments

Fixed double comments problem, cleaned up comments controller. Fixes #85
Changed to Rails 4