STUPID NOOBING GIT WILL PWN ME

I hate this :(
Merge branch 'master' of https://github.com/tubs/harmony