head fixed
conflicts fixed
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers
Merge pull request #33 from KackieM/master

kat about changes