discarding things?
hey.txt fucking things up?
Merge branch 'origin/Hieu'

Conflicts:
	Assets/Glow11/Glow11DemoScene.meta
	Assets/Glow11/Shaders.meta
	Assets/Glow11/_internal.meta
	Assets/Hey.txt.meta
last one
Updating with shaderforge
Updated with wonky lighting

Chris wanted us to block out areas with light
For some reason they aren't always showing up on the track though?
blained update week8
ignoring proper git files
Merge branch 'Blaine' into master-2

Conflicts:
	Assets/RacingGame/Scenes/gameStart.unity
	Assets/ShaderForge/Example Assets/Textures/sf_floor_wood.tga
	Assets/Standard Assets.meta
finished merging Blaine's stuff