Initial commit
Merge branch 'master'
Added gitignore