updates to site to make is usuable
Merge remote-tracking branch 'origin/master'