home page
home page style done
pulling master
Merge remote-tracking branch 'origin' into mattt