Merge branch 'master' into AB-take2
-rw-r--r-- 95 .gitignore
drwxr-xr-x - hacks