Fixed a whole bunch a stuff
Merge branch 'master' of https://github.com/apciero/PaperWebsite