fixing things
Merge branch 'master' of https://github.com/FuzzySunshine/Technology-Inferno-Blog