updating webpage
Merge branch 'gh-pages' of https://github.com/SeniorDesignProject/Mainline into gh-pages

Out of sync.