merge with master
-rw-r--r-- 78 .gitignore
drwxr-xr-x - astakos
drwxr-xr-x - docs
drwxr-xr-x - snf-astakos-app