Working on main page
Merge branch 'master' of https://github.com/tyler-cromwell/CSH-Yearbook