added gitignore
Merge branch 'master' of github.com:bajesse/git-workshop into dev
Merge branch 'master' of github.com:bajesse/git-workshop into dev
Edited my feature
Edited index for release 1
Merge branch 'release-1'