Update js files
Merge branch 'master' of https://github.com/somallg/dotfiles.git

Conflicts:
	GotAAdventure.js