.
Merge branch 'master' of https://github.com/pboechat/MexicanStandOff

Conflicts:
	Assets/Scenes/LevelGeneration.unity
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/TagManager.asset