Added gitignore
Added README
Merge branch 'hotfix' into maintenance