Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

.gitignore

+*.csproj
+*.sln
+*.userprefs
+/Assets/Resources/XmlItemsToExport.xml
 /Library
 /Temp
-/Assembly-CSharp.csproj
-/Assembly-CSharp-vs.csproj
-/dyingIsMainstream.sln
-/dyingIsMainstream.userprefs
-/dyingIsMainstream-csharp.sln

Assets/Resources/XmlItemsToExport.xml

-<?xml version="1.0" encoding="Windows-1252"?>
-<Levels xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Level>
-    <Item prefab="Player Two" x="-3.05" y="2.06" />
-    <Item prefab="Player One" x="-0.23" y="2.06" />
-    <Item prefab="Trap" x="-5.02" y="-0.57" rot="90" />
-    <Item prefab="ground" x="1.51" y="-0.8" scalex="58.39" />
-    <Item prefab="Turret" x="4.47" y="0.71" />
-    <Item prefab="PortableFire" x="4.04" y="-0.22" scalex="0.2" scaley="0.2" />
-  </Level>
-</Levels>
\ No newline at end of file