blah.
Merge branch 'master' of https://github.com/HunterDHayes/DoI

Conflicts:
	New Unity Project 1/Assembly-CSharp-vs.csproj
	New Unity Project 1/Assembly-CSharp.csproj
	New Unity Project 1/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
	New Unity Project 1/Library/AssetImportState
	New Unity Project 1/Library/AssetServerCacheV3
	New Unity Project 1/Library/CurrentLayout.dwlt
	New Unity Project 1/Library/ScriptMapper
	New Unity Project 1/Library/UnityAssemblies/UnityEditor.dll
	New Unity Project 1/Library/UnityAssemblies/UnityEngine.dll
	New Unity Project 1/Library/UnityAssemblies/version.txt
	New Unity Project 1/Library/assetDatabase3
	New Unity Project 1/Library/guidmapper
	New Unity Project 1/Library/metadata/00/00c3373e609664547b991b013f448bb7
	New Unity Project 1/Library/metadata/02/02f4d05ca104e1c439dbc8676604afc3
	New Unity Project 1/Library/metadata/03/03b18f1d44cbef34b92cddfa32bd0103
	New Unity Project 1/Library/metadata/03/03ec046838c2e3748b0643f42232cfa8
	New Unity Project 1/Library/metadata/05/05448834e5c37a6489503c71f94bcf1a
	New Unity Project 1/Library/metadata/07/07cfe7e85ec4fe84eb4d7db1fbe1879b
	New Unity Project 1/Library/metadata/0b/0b1f823635247ff4ba8ab6be88602868
	New Unity Project 1/Library/metadata/0b/0bf3aa542d2ef3e4590c9f2fe8bc2e69
	New Unity Project 1/Library/metadata/0c/0c6d253fa44d6af42b5f5ed6e1b25f13
	New Unity Project 1/Library/metadata/10/10c50de63b6645b41975d4078ae06eaa
	New Unity Project 1/Library/metadata/10/10d9b1d1daa41a14386422b09fee2ecd
	New Unity Project 1/Library/metadata/11/118e4afd9adb66b4188813e3e5c4a2e7
	New Unity Project 1/Library/metadata/12/123bf4a78273ab546b9c8da30618a491
	New Unity Project 1/Library/metadata/12/12baad93e7ab25e469e14d9f158c1569
	New Unity Project 1/Library/metadata/18/18010b2854919cd4f833b1234b73fb5b
	New Unity Project 1/Library/metadata/1b/1b094f2f82c0b5e4f8cb5b3756624916
	New Unity Project 1/Library/metadata/1c/1c6af73b0f337ab4694b4a84c2657632
	New Unity Project 1/Library/metadata/1c/1c8c041b483fee949ad0042fe9f83ed8
	New Unity Project 1/Library/metadata/1c/1ceceb7529866fb4d85381db7768c8cf
	New Unity Project 1/Library/metadata/1d/1de0903422becbf49805152eccd01b1a
	New Unity Project 1/Library/metadata/1f/1f0e7f937e051de4f86bfecb00e136cf
	New Unity Project 1/Library/metadata/1f/1f93c17b917174c4eb8b1f665fdd6f4b
	New Unity Project 1/Library/metadata/22/22762309fa2870744bc012985233c688
	New Unity Project 1/Library/metadata/23/233d32f0b89363246a6a00be96a0d697
	New Unity Project 1/Library/metadata/28/2853e14fff6524e4580ba72854129174
	New Unity Project 1/Library/metadata/2a/2aa1c80cb33ab304780e29d342da4b61
	New Unity Project 1/Library/metadata/2b/2bdc87405fade3249a34b175bf3f5235
	New Unity Project 1/Library/metadata/31/31de4b7083d3f6d4cbac57a81a8f03f9
	New Unity Project 1/Library/metadata/34/34ff79ec4eac77946b192bc9b511acc6
	New Unity Project 1/Library/metadata/37/37712e021774d584893eb4bc5ba8bb23
	New Unity Project 1/Library/metadata/38/388b68639d9b77748bc3fd20d914b664
	New Unity Project 1/Library/metadata/38/388fcce6e1b9a5e4298c1b26cd033aa6
	New Unity Project 1/Library/metadata/38/38ef640ec93e60c4a9531d1fa1e6fbcf
	New Unity Project 1/Library/metadata/39/39321ad2c6262304db60a1ab2cf1f260
	New Unity Project 1/Library/metadata/3c/3c18a01cba4eb0843b7eca34fe97096c
	New Unity Project 1/Library/metadata/3d/3d91f5dcfdecb2144b8af46a90f5f67f
	New Unity Project 1/Library/metadata/44/44d14a5c0d2e7b746874c170d5d122f5
	New Unity Project 1/Library/metadata/46/46327b8634ad8c2429f89718f44f107d
	New Unity Project 1/Library/metadata/48/48524c4d85259f340996d65e320457f2
	New Unity Project 1/Library/metadata/4b/4b6a2af173a661a458c47f89c17a179f
	New Unity Project 1/Library/metadata/4f/4f7bf9fdf18e0e34694b2260c566e6d0
	New Unity Project 1/Library/metadata/50/50f59ec0850892f4f9e5957542ce72bc
	New Unity Project 1/Library/metadata/51/51916c1b88c419d4fae189bfc120b446
	New Unity Project 1/Library/metadata/54/54705964943581a43ae50a9e918d28a7
	New Unity Project 1/Library/metadata/56/56fe7c58bf91d6d418d56501db40a2d7
	New Unity Project 1/Library/metadata/58/58136bbd2c3ce2245af4be375af9a922
	New Unity Project 1/Library/metadata/58/584d131c19fcfcd41aeead1db8b3826a
	New Unity Project 1/Library/metadata/58/58ade29b91c82f74bbeaa68745f51413
	New Unity Project 1/Library/metadata/59/59bbcf8ce51087a44bf06cdc9a3ca265
	New Unity Project 1/Library/metadata/5b/5b60b6e3e824b174883e2899efbc65a5
	New Unity Project 1/Library/metadata/5c/5c94868df244f654f92ef9bb0b30400b
	New Unity Project 1/Library/metadata/5d/5de206503f1003e42bbf0da1edb353f0
	New Unity Project 1/Library/metadata/5e/5e5a40ecc30917949aec2d00ad79a6b0
	New Unity Project 1/Library/metadata/5e/5e6b1fe9ecf231a47a6b6415f7ba6b4c
	New Unity Project 1/Library/metadata/5f/5f314e6d03bd8ea41aadedffc0c94113
	New Unity Project 1/Library/metadata/60/6094544b97e98d345ae575b878cc2e04
	New Unity Project 1/Library/metadata/61/6199de32a060df5439154302976349a0
	New Unity Project 1/Library/metadata/63/6360127ca10c0bd4786573970180ecde
	New Unity Project 1/Library/metadata/64/6419104568e89e946ac7453b7add71b9
	New Unity Project 1/Library/metadata/65/651fd6aafa6904e4eb1ea6fa1f667ec0
	New Unity Project 1/Library/metadata/65/65455eca8ab7fab4ea11ae9091283834
	New Unity Project 1/Library/metadata/65/65b4a699d28c1fe44a7eb325bae4114b
	New Unity Project 1/Library/metadata/67/67e1b385ebe4f1740b162f49e53eb975
	New Unity Project 1/Library/metadata/6f/6f84231d381e21741afb03afec431590
	New Unity Project 1/Library/metadata/76/76207007f3b4a4c44832df6b68203632
	New Unity Project 1/Library/metadata/82/8252cf10ba5ed084dbc287a3c20ee6b2
	New Unity Project 1/Library/metadata/84/84afb5e4bb964ec4d82b499c683123b8
	New Unity Project 1/Library/metadata/87/8778a6f8a830e8c45a8b83c65d52a5c6
	New Unity Project 1/Library/metadata/89/892901c47f1d220409642c5ffa87879e
	New Unity Project 1/Library/metadata/8b/8b0124482a89440489e816604e0e0321
	New Unity Project 1/Library/metadata/8c/8c2290ebdbda65e469617051de5266bc
	New Unity Project 1/Library/metadata/8e/8e1f2387d8086f0469750b19de71d387
	New Unity Project 1/Library/metadata/8e/8e4be3bdbda906b4fab5229adfc34c83
	New Unity Project 1/Library/metadata/8f/8fca20d580453aa40bee3c1ce15102dd
	New Unity Project 1/Library/metadata/93/93078c54ee3ff3b439daa9d769c7783d
	New Unity Project 1/Library/metadata/97/9741f03c87b18734fae0649accf940e3
	New Unity Project 1/Library/metadata/97/97e801a253c5bc441bbbb11c01e5cfe7
	New Unity Project 1/Library/metadata/98/988aaf90a65dc034892e38ac40e4ea18
	New Unity Project 1/Library/metadata/99/9954cd6dca3885c48b37b6d50878e01f
	New Unity Project 1/Library/metadata/99/99e4ea72e4a21ce47a14ca3cd770bd94
	New Unity Project 1/Library/metadata/9c/9c01964774b93314bb7b3c43be3d2c13
	New Unity Project 1/Library/metadata/9c/9cd5031713ab4674b860b141bc57d265
	New Unity Project 1/Library/metadata/a5/a54e6866c67949a49b75d5b2a362e2de
	New Unity Project 1/Library/metadata/a7/a7f4ca3ba5d623a488a2cd6870758a61
	New Unity Project 1/Library/metadata/a8/a8ddad8cc5e5de94d8710ab5904e80b6
	New Unity Project 1/Library/metadata/a8/a8fe0ee40f1a25548939517f016ebddf
	New Unity Project 1/Library/metadata/aa/aa71dcd47e282a346a8ab62725d5061a
	New Unity Project 1/Library/metadata/ab/abc782e2b33c594488c5ab1158ee6707
	New Unity Project 1/Library/metadata/ac/acdea1008a17cf84c96739512cc74d97
	New Unity Project 1/Library/metadata/ae/aef39f3c0f96fa245bf9039e7e8e4af5
	New Unity Project 1/Library/metadata/b3/b3f7ca46e2a0d2a4596bfbc5990a1d9e
	New Unity Project 1/Library/metadata/b8/b8d35b6b9866c3245a9e32f420763cb1
	New Unity Project 1/Library/metadata/bb/bba88fa48d56dcf4ab5284b5e7466ef3
	New Unity Project 1/Library/metadata/be/be592064843e18d4db58d49cfa901895
	New Unity Project 1/Library/metadata/bf/bf5b464960737044cb439485da322f04
	New Unity Project 1/Library/metadata/bf/bfa3c1b001d62a64c82b771651e82327
	New Unity Project 1/Library/metadata/bf/bfacb42cce624b849821b01bc4683a56
	New Unity Project 1/Library/metadata/bf/bffcf522ba054054cae7d5884e772f3e
	New Unity Project 1/Library/metadata/c8/c865d8c44983e794da2ff6b59019de58
	New Unity Project 1/Library/metadata/cb/cb184a72b998e2d4b9bd854e542c9206
	New Unity Project 1/Library/metadata/cd/cdeb31ff5e34f874fb31080481444f35
	New Unity Project 1/Library/metadata/cf/cfa561e78c3bbad4b81e95744932da4b
	New Unity Project 1/Library/metadata/d1/d1e183983d0b5eb43bd249b13e9f072f
	New Unity Project 1/Library/metadata/d5/d591642826037ab4484e2f9e9416098f
	New Unity Project 1/Library/metadata/d7/d7c49e785c8805e4d9489117aa209323
	New Unity Project 1/Library/metadata/d8/d8d466a46fa9dfb4c9299ddeeb9fc28d
	New Unity Project 1/Library/metadata/d9/d9bbaee6c3854674284443460234b7c7
	New Unity Project 1/Library/metadata/db/db47c6079652a6b42b0fa20da9665db1
	New Unity Project 1/Library/metadata/df/dfe81dfeda0248d428b365a68e0b9abc
	New Unity Project 1/Library/metadata/e0/e042880f27ad33c45ae87860b7dfacb9
	New Unity Project 1/Library/metadata/e0/e0d57cccc154d5a4c823dc3e874e7cd0
	New Unity Project 1/Library/metadata/e2/e21c48d676ee4d14586eb150e778f005
	New Unity Project 1/Library/metadata/e5/e5462190ba52de24d9d036f534af6057
	New Unity Project 1/Library/metadata/ee/ee9b39b148300a845b728511a6e34930
	New Unity Project 1/Library/metadata/ef/ef6ed853a42598342947a4987bd39c24
	New Unity Project 1/Library/metadata/ef/ef9cfee6dd57354489f15086c725d270
	New Unity Project 1/Library/metadata/f2/f23afea78080dbe46a378daac05f07d3
	New Unity Project 1/Library/metadata/f2/f27681eefe66794439df44dd570f1ffa
	New Unity Project 1/Library/metadata/f9/f91de0de2f4ac4346b132c47a3f8819d
	New Unity Project 1/Library/metadata/fb/fb6c21c06438c274b8c276dafc090d7f
	New Unity Project 1/Library/metadata/fc/fc3e982d16818bd468a86ab96e7b65ba
	New Unity Project 1/Library/metadata/fe/fe5a12575984ef346bcf802fd3028641
	New Unity Project 1/New Unity Project 1-csharp.sln
	New Unity Project 1/New Unity Project 1.sln
	New Unity Project 1/New Unity Project 1.userprefs
	New Unity Project 1/UnityVS.New Unity Project 1.CSharp.csproj
shop is almost done.
Merge branch 'master' of https://github.com/HunterDHayes/DoI

Conflicts:
	New Unity Project 1/Assembly-CSharp-vs.csproj
	New Unity Project 1/Assembly-CSharp.csproj
	New Unity Project 1/Assets/DoI.unity
	New Unity Project 1/UnityVS.New Unity Project 1.CSharp.csproj
blah