Testing Setup
Merge branch 'testing'
Merge branch 'master' of https://github.com/jayitinc/TheLegendOfStyk