.gitignore changed
Merge branch 'master' of github.com:kuntao/taskeyOnRails