fixing shit, whoops
Merge branch 'master' of http://github.com/blackchair/blackchair.github.io
fixing