Add .gitignore
Added readme
Merge branch 'hotfix' into maintenance