Merge pull request #19 from Winston-Chan/nathan

Fixed ALL THE PROBLEMS
Test
Haskell
Moved testing folder to the root of the project since it will be reused lots.