update 21MAR 3:30pm
Merge branch 'master' of http://git.starkpcr.net/scm/per/website