Moved parsing functions to Parser, modified Solver.
Merge pull request #7 from Winston-Chan/nathan

Moved parsing functions to Parser, modified Solver.