Level and Weapon Merge plus dynamite
no message
Weapons and level
Merge commit 'e4c303d861e88c19550e88866132d7d8341e8f44'

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Maya Models/Enemy Small Version.prefab.meta
	Assets/Maya Models/Materials/Materials/ShotgunShellMat.mat.meta
	Assets/Prefabs/Dynamite Pellet.prefab
	Assets/Prefabs/Dynamite.prefab
	Assets/Prefabs/Enemy.prefab.meta
	Assets/Prefabs/Exit.prefab
	Assets/Prefabs/FloorMaker Initial.prefab
	Assets/Scripts/Exit.cs
	Assets/Scripts/Exit.cs.meta
	Assets/Scripts/FloorMaker.cs
	Assets/Standard Assets/Skyboxes/Eerie Skybox.mat.meta
	Assets/Standard Assets/Skyboxes/Overcast2 Skybox.mat.meta
	Assets/levels/TestLevel.unity
	Assets/prefabs/enemy.prefab.meta
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/37/37d1163a05e8a4285a0ef85160d262b3
	Library/metadata/6b/6b4c4b0c167fd4c57880f94cc0f6df67
	Library/metadata/7f/7f51f22eb62374409a6895a186d7f714
	Library/metadata/a2/a2d2dbc7d21b849ef803f2d3d53c2b6d
	Library/metadata/af/af736d62be17f49ecabd2341c66ebec8
	Library/metadata/dc/dce6c4826977f4ee48cde3697ce45ffa
	Library/metadata/ec/ecd52a86ff47e4b73893761691239712
	Library/metadata/f2/f290e4f115ad44bcfbe4b78ce468888f
	Library/metadata/f2/f2e9a446d8bec48438eb3b32364572a1
	SpaceTown-csharp.sln
	SpaceTown.sln
	SpaceTown.userprefs