Merge pull request #1 from darkkaos505/master

pull?
Tower Update

new roof, minor grouping
some textures, art rubbish

It's shit
Tower updates

I'm barely getting anything done, no comms = no motivation
Merge pull request #2 from CallumWaddell/master

Merge the fucktons of callum
ignore this shit
ignore this shit
Test Master change
solve test
Merge remote-tracking branch 'origin/GiraffeBranch'

Conflicts:
	JamTestBed/Assets/Models/Materials.meta
	JamTestBed/Assets/Models/Materials/material.mat
	JamTestBed/Assets/Models/Materials/material.mat.meta
	JamTestBed/Assets/Models/Tower.dae.meta
	JamTestBed/Assets/Scenes/TestBed1.unity
	JamTestBed/JamTestBed-csharp.sln
	JamTestBed/JamTestBed.sln
ignore
Art cleanup and update
Merge pull request #6 from GiraffePencils/master

Master Heres some art