updating amalgam website
30 files changed