Merge pull request #16 from albertcui/iss-11

Merging.
Merge pull request #10 from albertcui/teammates

Merging Teammates
Merge branch 'master' of github.com:albertcui/yasp into parsedata
working on parser