added parsing functions
Merge branch 'master' of https://github.com/mbaago/MiniProject2