Merge pull request #1 from Martin91/develop

Support capistrano
check Gemfile.lock into version control
Merge branch 'master' of github.com:Martin91/Martin-Typo