Merge branch 'master' of /home/einstein/wking/public_html/code/git/parallel_computing
-rw-r--r-- 9 .gitignore
-rw-r--r-- 595 .htaccess
drwxr-xr-x - _doc
drwxr-xr-x - _script
drwxr-xr-x - assignments
drwxr-xr-x - content
drwxr-xr-x - grades
-rw-r--r-- 823 index.shtml
drwxr-xr-x - lectures_and_recitations
drwxr-xr-x - objectives
drwxr-xr-x - resources
drwxr-xr-x - shared
drwxr-xr-x - src