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

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

html edits
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