Merge pull request #6 from CallumWaddell/master

Merge pull request #8 from GiraffePencils/master
Swarm Art

Swarm UV and texture
Swarm Art

Uv and Texture
Revert "Tower Model fixed"

This reverts commit 70ed3d682eb971576e5c9f0c4ac025933e9018be.

Revert "Tower cleanup"

This reverts commit
0d6d11f51d8c0a09e0e56c335f458c396c9b4f09.

Revert "Tower cleaned"

This reverts commit
8dd5be613344122942230e88d8f5eb4df77dddb4.

Revert "h"

This reverts commit
f18582d39c2a07b78241ed418daad2be8afb807c.

h

Tower cleaned

deleted uv

Tower cleanup

aoeu

Tower Model fixed

Textures need fixed
Art Fix

reasonable sized models
Merge pull request #7 from CallumWaddell/master

Swarm and Treeman
Merge remote-tracking branch 'origin/master'

Conflicts:
	JamTestBed/Assets/Models/Tower.dae.meta
swarm?
ignore
Merge remote-tracking branch 'origin/19/11/14'

Conflicts:
	JamTestBed/Assets/Models/SwarmEnemy.blend
	JamTestBed/Assets/Models/SwarmEnemy.blend.meta
	JamTestBed/Assets/Models/SwarmEnemy.blend1
cleanup

deleted un-needed files
Art Imputted
Merge pull request #9 from GiraffePencils/master

Art, cleanup, not much else
fixed any pull related errors

might of also fixed the death with hp
fixed shield model/game asset
shit missed files
prototype merge fix

lets see if this breaks everything
more merge fixes

test bed is now called game