Merge branch 'encoding'
-rw-r--r-- 139 .gitignore
drwxr-xr-x - design
drwxr-xr-x - papers
drwxr-xr-x - src