Commit test
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity_Projects/BasisLevelBeta/Assets/scenes/basis scene start.unity
	Unity_Projects/BasisLevelBeta/Library/assetDatabase3
	Unity_Projects/BasisLevelBeta/Library/guidmapper
Merge branch 'master' of https://github.com/tim427/minorproject

Conflicts:
	Unity_Projects/BasisLevelBeta/Assembly-CSharp-vs.csproj
	Unity_Projects/BasisLevelBeta/Assembly-CSharp.csproj
	Unity_Projects/BasisLevelBeta/Assets/scenes/basis scene start.unity
	Unity_Projects/BasisLevelBeta/BasisLevelBeta-csharp.sln
	Unity_Projects/BasisLevelBeta/BasisLevelBeta.sln
	Unity_Projects/BasisLevelBeta/Library/CurrentLayout.dwlt

	Unity_Projects/BasisLevelBeta/Library/ScriptAssemblies/Assembly-CSharp.dll

	Unity_Projects/BasisLevelBeta/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity_Projects/BasisLevelBeta/Library/assetDatabase3
	Unity_Projects/BasisLevelBeta/Library/expandedItems
	Unity_Projects/BasisLevelBeta/Library/guidmapper
Update gitignore for Unity
Fix for Jordi
Merge branch 'master' of https://github.com/tim427/minorproject
Merge remote-tracking branch 'origin/master'