Merge branch 'master' into quizzes
-rw-r--r-- 825 .gitignore
-rw-r--r-- 34500 License
-rw-r--r-- 20789 README.md
-rw-r--r-- 10683 Vagrantfile
drwxr-xr-x - confs
drwxr-xr-x - docs
-rw-r--r-- 7705 fabfile.py
drwxr-xr-x - karmaworld
-rwxr-xr-x 429 manage.py
drwxr-xr-x - reqs
drwxr-xr-x - var