Added some files to play around with
Merge branch 'master' of https://github.com/Imkerix/derp