gitignore and test
finished test
Merge branch 'dev'