Moved around stuff so that it shows up, updated to real config
Merge branch 'master' of github.com:anair13/anair13.github.io