saving mini changes on athena
Merge branch 'master' of https://github.com/cjosephson/www

Conflicts:
	writing.html
svaingw riting update
Merge branch 'master' of https://github.com/cjosephson/www