merging files
Merge branch 'master' of https://github.com/stephenfarrar/hello

Conflicts:
	two-pages.html~
Changes made to handleMultipleResults