First commit
Fix readme & gitignore conflix