Not sure
Merge branch 'NewMaster' of https://github.com/alexdbaldwin/Superbowl3D into NewMaster

Conflicts:
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	Library/metadata/0e/0e08495f351a81348aabcbf1e218ad2d
	Library/metadata/15/1542dd04c2a3ebe40a9d8977d9bfc185
	Library/metadata/1d/1d6bb93179317cd4fb8345d2d524c186
	Library/metadata/29/29b788344a3371b4d8e1ff5a75468c99
	Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	Library/metadata/30/3064109fb3671064da6a51d7f74c9384
	Library/metadata/35/35cb4e36466d10b4991e310dab3d933e
	Library/metadata/37/370d102026b21f04b9b02f373a6a119d
	Library/metadata/39/39a5ce1bc11356b438d4b192d6fff70f
	Library/metadata/3b/3bc51d2210a4a3743bea23444dc183bd
	Library/metadata/3c/3c6f92a7db920e7498ab385285cbfedc
	Library/metadata/3e/3edb2f2d7b835d94a9a278edb284f26d
	Library/metadata/3e/3ee5153b4aaa0ca4dac3760744dfbd7d
	Library/metadata/42/42db58b569813ca4cba5a5a5c3f4e00d
	Library/metadata/45/45beee6eb6a072d46aaf4f767f67a7f3
	Library/metadata/48/48defbf9350469c4d84fd6cca1144fb2
	Library/metadata/4a/4a967f22c42803c469a2b3442125da1f
	Library/metadata/4d/4d9ba1231faa07947a45d681a6c34e04
	Library/metadata/4e/4edf6cd20b2251041986a10a57fe4b72
	Library/metadata/54/5426338e0da9e5d429525ce7d35197b8
	Library/metadata/5b/5baab0abccc10954780529c71f1c38e5
	Library/metadata/5e/5e731f61c5b9b014caad5fb9c234133e
	Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	Library/metadata/7e/7ee1a85748b2f6348ba1f2731535b452
	Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	Library/metadata/83/839b63c66a28e4943a3f6a6f669091fd
	Library/metadata/8a/8a4bda6dc0d6316429b6a9e1b294b933
	Library/metadata/8a/8a97cf9e4ec150c4daccccadaaf0b813
	Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	Library/metadata/8e/8e665c7a02fcb46dda3f6d5fb2a9567e
	Library/metadata/8f/8f33ac809461e4fa681f1eb0d253ff3a
	Library/metadata/8f/8f5d5e9ba626e864ab43b779a29b368b
	Library/metadata/98/981c0c82a6bc9a9468cf524fb2e14164
	Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	Library/metadata/b2/b20d17cdb28c511489d513c737681965
	Library/metadata/bb/bb6595d193f8de544a96feb630b7e89f
	Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	Library/metadata/d3/d33960b2624dfe94c84c41e02a55cf76
	Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	Library/metadata/e3/e38a3b3553ff2ce49a5115fa88894783
	Library/metadata/e3/e3f35472623a8f1479abf03b4e0c26ab
	Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	Library/metadata/e9/e9a3e0fc187043d4cb67c1098433b963
	Library/metadata/f8/f8b8cca37091a1349b6a9baa41150d3c