trigger plate
Merge branch 'master' into Atlas

Conflicts:
	Library/InspectorExpandedItems.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/TagManager.asset
level design begins
merge swiping into Atlas brench
level designing + door switch & color changes
some little changes
level deisgn ongoing
Merge branch 'master' into Atlas

Conflicts:
	Assets/Prefabs/Player Character.prefab
	Assets/Scripts/CharacterTopDownMovement.cs
	Library/InspectorExpandedItems.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/TagManager.asset
conflict
Merge branch 'master' into Atlas

Conflicts:
	Assets/Prefabs/Player Character.prefab
	Assets/Scripts/CharacterTopDownMovement.cs
	Library/InspectorExpandedItems.asset
	ProjectSettings/DynamicsManager.asset
	ProjectSettings/TagManager.asset
level
Merge branch 'master' into Atlas

Conflicts:
	Assets/Scripts/CharacterTopDownMovement.cs
	Library/InspectorExpandedItems.asset
5 levels completed
changes
Level.unity
Merge branch 'Atlas' into Michael2

Conflicts:
	Assets/Level.unity
	Assets/Prefabs/MainCharacter.prefab
	Assets/Scripts/CharacterTopDownMovement.cs
Some Changes
Merge branch 'Michael2'

Conflicts:
	Assets/Level.unity
	Assets/Prefabs/MainCharacter.prefab
Character