Merge branch 'master' of github.com:timecard/timecard-rails
Fix Gemfile
Update README.md
Merge branch 'master' of github.com:timecard/timecard-rails
Merge branch 'master' into hotfix
Merge pull request #470 from kmiyake/hotfix

Fix Gemfile