Additions
Updating files and deletions
Merge remote-tracking branch 'origin/master'

Conflicts:
	maps2.html
	maps2.js