Scrap class
Scrap starter code
Merge branch 'master' into ScrapBoxes
Added static library and tiles bps
Death Tile Collision

Changed Death Tile Collision to fit the tile, was bigger than tile
before
Added terrain map
terrain wip 3
Death Tile Collision/ Death Tile v1 test

Working on detecting enemies on tiles, also edited death tile v1 to
practice object placement
terrain wip 4
bombardment almost final
bombardment tiny changes
adding traps and props to 7 deathtiles

added the blue print traps, used static meshes for props.
Tile Movement

Tiles now move up and down, still working on enemy detection
Merge branch 'LevelGeneration' of https://github.com/MetalMuffinStudios/Dieseland into LevelGeneration

Conflicts:
	Content/Level/DeathTiles/DeathTile_v1.uasset
	Content/Level/DeathTiles/DeathTile_v10.uasset
	Content/Level/DeathTiles/DeathTile_v11.uasset
	Content/Level/DeathTiles/DeathTile_v12.uasset
	Content/Level/DeathTiles/DeathTile_v13.uasset
	Content/Level/DeathTiles/DeathTile_v14.uasset
	Content/Level/DeathTiles/DeathTile_v15.uasset
The rest of the tiles populated with traps/props
The rest of the tiles with traps/props
Update .gitignore

Un-ignored .uasset files
Reverting 7 tiles to previous versions
Merge branch 'LevelGeneration' into Terrain
Merge with master