Added word parser
Merge branch 'master' of https://github.com/MattPG/FIT3143.git