made changes to the front page
Merge branch 'rick'