Final Version

Haven't uploaded changes in a while, here's the final site.