Reversing the 3 latest commits (TEST)
Merge branch 'master' of https://github.com/theysconator/tripping-dubstep