general updates, through primary instructions
adds gitignore
Merge branch 'develop'