Merge remote-tracking branch 'upstream/master'
Updated parser to spit data and labels for three graphs
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from akcramer/master

Merging versions