Merge branch 'master' of https://github.com/cfol103/xplorethrjtjhdrbluckefjelrehbnlvjuchhb

Conflicts:
	code.js
	index.html
javascript