first commit here
Merge branch 'master' of https://github.com/HazeyCoder/testing