format stuff
Merge branch 'master' of https://github.com/christof-leng/berkeley-guide