changed home page
Merge branches 'brandon' and 'master'