changed gitignore
Merge branch 'beta'