initial commit
add gitignore
Merge branch 'master' into dev