Added DOM query function
Merge branch 'master'

Conflicts:
	app.js