committing after not having checked this in a while
Merge branch 'master' of https://github.com/WeHateNick/wehatenick