Updated the history
Merge branch 'master' of github.com:audreyr/cookiecutter