homepage nearly done
Merge branch 'master' into ryan