Merge branch 'master' of ygdrassil:ri1617
-rw-r--r-- 67 .gitignore
drwxr-xr-x - architecture
drwxr-xr-x - final_review
drwxr-xr-x - frontpage
drwxr-xr-x - proposal
drwxr-xr-x - weeklies