Changes made
Merge branch 'master' of https://github.com/gbrodman/finalProject
Some nicer looking pages, more to come
Fixed conflict