Added gitignore and lisence
Merge branch 'master' into logic