Updated gitignored. Added modules and package
Merge remote-tracking branch 'origin/development'
Merge branch 'master' of https://github.com/petreboy14/stream-merge-sort