added a timer to Match3.cs and a corresponding GUIText
Merge branch 'master' of https://github.com/MartinSkytte/eTD
fixing some screwey git stuff
Merge branch 'master' of https://github.com/MartinSkytte/eTD
actually added the animations this time, along with a script that will hopefully be useful in managing the creeps
Merge branch 'master' of https://github.com/MartinSkytte/eTD
slight update to basicUnit.cs (creep management script)
added a base trigger, destroys all colliders with tag Enemy
Merge remote-tracking branch 'origin/spawner'
Merge branch 'master' of https://github.com/MartinSkytte/eTD

Conflicts:
	code/Assets/Scenes/towerdefence.unity
Work done on text

Attempt to make the text ingame smarter, instead of having several GUIs,
still working on it
optimized the spawner and deleted Basic unit v2

Optimized the spawner and deleted the Basix unit v2, furthermore the
target is updated to despawn the units when they reach the goal
made the towers kill stuf and cost money
merged
added tower and GUI info to scene
Next wave button added

Added Next wave button and functionality. The button initializes and
spawns the next wave
Match 3 update

Still working on gui Text
Merge branch 'master' of https://github.com/MartinSkytte/eTD

Conflicts:
	code/Assembly-CSharp-Editor-vs.csproj
	code/Assembly-CSharp-Editor.csproj
Update of deleted files
Attempt to solve errors