Merge branch 'master' of upsilon.cc:/home/zack/git/homepage