Brick_Glass.cs
Merge branch 'master' of https://github.com/Caster123/CS3247Project

Conflicts:
	Unity Project/Library/CurrentLayout.dwlt
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity Project/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity Project/Library/assetDatabase3
	Unity Project/Library/metadata/59/599e623c3e215c94b8b416cd1986a076
	Unity Project/Library/metadata/5d/5d26874480d423b459e15044b69bfca0
	Unity Project/Library/metadata/bd/bdf28100e240eee4eb83f8c9569a8bd4
	Unity Project/Library/metadata/ca/ca49380a71a2bb64c830d06bd421b9d1
	Unity Project/Unity Project-csharp.sln
	Unity Project/Unity Project.sln