Updated gitignore
Merge commit 'c30b55017f4f2a95b332a9c37a26c5f23b7e8132'
Updated readme