Merge pull request #20 from Winston-Chan/nathan

Moved testing folder to the root of the project since it will be reused ...
Merge remote-tracking branch 'origin' into nathan