first commit
adding untracked files and more .gitignores
Merge remote-tracking branch 'origin/develop' into develop