updating
includes Shawn's updates
erge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers

Conflicts:
	app/scripts/data.js
working on "if"
'if' updates
update
updated

Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers

Conflicts:
	app/scripts/data.js
underscore.js add

Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers into andrewraynal/theDomTraversers
Merge pull request #27 from KackieM/katinfo

kat title change
edited shawn title
Merge pull request #28 from shawnlknight/shawnInfo

edited shawn title
test
testing
update
Merge pull request #30 from andrewraynal/andrewraynal/theDomTraversers

Andrewraynal/the dom traversers
kat about edited