Merge branch 'master' of https://github.com/bicro/retoohs

Conflicts:
	retoohs/retoohs/GameScene.swift