try
Add new file
Merge branch 'master' of https://github.com/louistang5/game

Conflicts:
	.gitignore
	index.html