removing js doc ready line 1
Merge pull request #18 from shawnlknight/master

edited html and js
Merge pull request #19 from shawnlknight/master

html edits
Merge pull request #21 from shawnlknight/master

more if statements
conflict merged
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers

Conflicts:
	app/scripts/main.js
Merge pull request #22 from shawnlknight/master

fixed spacing
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers
added comment
add comment
amend comment
Merge pull request #23 from calweb/calvinTopic

add comment
merging
Merge pull request #25 from shawnlknight/master

added about.js
about.js update
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers into shawnInfo
Merge pull request #26 from shawnlknight/shawnInfo

about.js update
kat title change
Merge pull request #27 from KackieM/katinfo

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

edited shawn title