working on home page
Merge branch 'master' into ryan