updated homepage
Merge branch 'james'