Updates to website. Version 1.0 nearly finished.
Merge remote-tracking branch 'origin/master'