head fixed
conflicts fixed
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers
about info
Merge pull request #32 from andrewraynal/andrewraynal/theDomTraversers

about info
shawn about info
Merge pull request #33 from KackieM/master

kat about changes
Merge pull request #34 from shawnlknight/shawnInfo

shawn about info
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers into katinfo