updated .gitignore
added outline
Merge branch 'master' into 01_general
updated perms