Password check.
Merge branch 'GL'
add Q function
convey user.Id in the URL to the pareView page
Merge branch 'GL'

convey userId into parenView Page
Add child feature almost done
fix merge conflicts
fix “/”
Give user child id
Merge branch 'master' of https://github.com/glzjuer/ChildrenTracker
Merge branch 'master' into GL
“ log ” and parentView modification
update dropdown list
little
no useful change…change format a little
accomplish the show children function
Merge branch 'GL'

Conflicts:
	index.js
	parentView/map.js
	parentView/parentView.html
	queue.js
fix conflicts
fix password conflicts
Merge branch 'gh-pages'

Conflicts:
	index.js
	parentView/map.js
	parentView/parentView.html
	queue.js