added gem files
update
gemfile update
gemfile update
gem update
Merge branch 'master' of github.com:NicholasJay/cardMe
Merge branch 'master' of github.com:NicholasJay/cardMe
merge
finish user story: can edit profile
user can pick card to send
Updated email to accept card info
Merge pull request #13 from sandycjyu/ProfileEdit

Profile edit
merged cards controller
Merge branch 'master' of https://github.com/NicholasJay/cardMe
fixed session to contain error message
fix shallow problem
fixed conflict
Token model and tests with Secure Random; expiration 3 days later
fixed shallow issues
Merge pull request #15 from sandycjyu/ProfileEdit

fixed session to contain error message