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

Conflicts:
	app/scripts/data.js
Merge pull request #46 from andrewraynal/andrewraynal/theDomTraversers

edits