Fixing stuff.
Reverting stuff.
Merge branch 'master' of github.com:ptz0n/ptz0n.github.com