updated to get session[:user_id]
Merge branch 'master' of https://github.com/conwaychriscosmo/Generosity
Merge branch 'master' of https://github.com/conwaychriscosmo/Generosity
updated gifts and challenges for first user
Merge branch 'master' of https://github.com/conwaychriscosmo/Generosity