tmp changes
Merge branch 'master' of https://github.com/e-zhang/gutshotgames

Conflicts:
	sumosmash/.DS_Store