Release 1.0.0
Fixing conflict in .gitignore