add parse function
change function name getData to toData
change some function parameter
Merge branch 'master' of https://github.com/vodaben/CSCI4430A1.git