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

Andrewraynal/the dom traversers
Merge pull request #32 from andrewraynal/andrewraynal/theDomTraversers

about info
kat about edited
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
Merge pull request #35 from KackieM/katinfo

Katinfo
lots of adds
Merge pull request #36 from shawnlknight/shawnInfo

lots of adds
lots of additions
Merge pull request #37 from shawnlknight/shawnInfo

lots of additions
deleted item from data.js
Merge pull request #38 from shawnlknight/shawnInfo

deleted item from data.js
added shot template
Merge pull request #39 from shawnlknight/shawnInfo

added shop template
more edits