Tweaked data format and added a parser.
Merge branch 'master' of https://github.com/kyangca/CS152