Merging with gitignore
Merge branch 'master' of github.com:bigcommunications/countdown