adds gitignore
adds gitignore
changes readme to test push
Merge branch 'rebase'
Merge branch 'master' into rebase