removing js doc ready line 1
conflict merged
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers

Conflicts:
	app/scripts/main.js
Merge branch 'master' of github.com:TIY-Q2-FEE-CHS/theDomTraversers
added comment
merging