Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
pass parameter test
pass parameter and view location test
delete file no longer in use
location test
location test 2
location test2
location
location
authenticate child ID (works)
location test
location test
update
Merge branch 'gh-pages'

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