Key ring update

keys fall into place when picked up
no collisions with
other
keys
rotates off ring when looking up or down
joint stretches
over
time

sprint now recharges as long as shift is not
held

disabled
terrain collider so player can enter tunnels
again

slightly shrunk
player to better fit into greenhouse
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/Scenes/HomeSweetGnome.unity
	Assets/Standard Assets/Water (Pro
Only)/Water4/Sources/Materials/Water4Example.mat
	Assets/WorldObjects/Entities/Player/Landing.anim
	Assets/WorldObjects/Entities/Player/Sprint.anim
	Assets/WorldObjects/Entities/Player/Walk.anim
	Library/AssetServerCacheV3
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	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-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/ScriptMapper
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000002000000000000000
	Library/metadata/00/00000000000000003000000000000000
	Library/metadata/00/00000000000000004000000000000000
	Library/metadata/00/00000000000000004100000000000000
	Library/metadata/00/00000000000000005000000000000000
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/00/00000000000000006000000000000000
	Library/metadata/00/00000000000000006100000000000000
	Library/metadata/00/00000000000000007000000000000000
	Library/metadata/00/00000000000000008000000000000000
	Library/metadata/00/00000000000000009000000000000000
	Library/metadata/00/0000000000000000a000000000000000
	Library/metadata/00/0000000000000000b000000000000000
	Library/metadata/00/0000000000000000c000000000000000
	Library/metadata/00/003377fc2620a44939dadde6fe3f8190
	Library/metadata/01/017ca72b9e8a749058d13ebd527e98fa
	Library/metadata/01/01a4819eecfa8f04daab4d96801d1c35
	Library/metadata/02/0264ca3e0a8b1ec4aac1d2ba7b74d924
	Library/metadata/06/061649741d22e5b4db194e3c3b7bcd58
	Library/metadata/07/07363cc03757da8468b121a302e06340
	Library/metadata/08/0813ec60d814f8f478e4784f341031c2
	Library/metadata/0a/0aad0ea6c6c244b46a62667f33155688
	Library/metadata/0a/0aeaa4cb29f5d4e9c8455f04c8575c8c
	Library/metadata/0b/0b1278a4176cbb344a9a7edf1c5c146d
	Library/metadata/0b/0b51a8b010d1b3149ae4c9f73f2b3d89
	Library/metadata/0b/0bdd0bb3c491b804cad528764eeaaeff
	Library/metadata/0d/0d1644bdf064147baa97f235fc5b4903
	Library/metadata/0e/0e447868506ba49f0a73235b8a8b647a
	Library/metadata/0e/0ef351a17aebf3c49b99e1fc11255b27
	Library/metadata/11/11154165e0ef1e3418a3337247cc2d29
	Library/metadata/14/14e9e385964340949ae2a983196f9a5e
	Library/metadata/15/15577174a872740edb59495b6549a0c3
	Library/metadata/16/16cfec6348980e144a4689835a607c65
	Library/metadata/17/17e234879cb994b7f93d7437c10d23d6
	Library/metadata/1b/1bf34b610fe6f466faff3dcd833c06f6
	Library/metadata/1e/1e68e75546e8d4feab8846bfaf8878d3
	Library/metadata/1e/1edfae5c7fc834f76b77bee26e88e0a4
	Library/metadata/28/28f5f4cae6139764790678574f717d14
	Library/metadata/2b/2b382c059b23e074fb9415cac425ca6c
	Library/metadata/2b/2bc9296bde0429943befd4f537a81350
	Library/metadata/2c/2c538784885b34a5987ed9f6651d9ecd
	Library/metadata/2e/2e0a532959e9df34aa2e731122bc2ffd
	Library/metadata/30/3033e46ab6c9e44a9b9dd0e9f5130357
	Library/metadata/32/32569ca6b14e24176be40165ccaa300c
	Library/metadata/34/3457ed98422316145af012829e2306bf
	Library/metadata/34/348041f1c0641d84fa3dbbb62a3e7cc2
	Library/metadata/35/353ddbc784290f14982dddd48a168a95
	Library/metadata/35/356d385a59c53487ebe6e3363ff4ffa2
	Library/metadata/36/36f6305de8a77604eafc51f82aecd0b9
	Library/metadata/3b/3bbbb1d2bfc4f43f79f3226bca2d1f64
	Library/metadata/3c/3cadc5c144b6941fd9b94e6f6cbaa3cc
	Library/metadata/3c/3cc8ac37e0da341db819af6143a07b03
	Library/metadata/3d/3d4f72d302f0f01408afbf0a4c106449
	Library/metadata/3d/3dd33acc06f194845baa2d45b75f7ab7
	Library/metadata/3f/3f272bca0aee78e4aa76fb199eaae8e6
	Library/metadata/42/4207ea88c7573ef4ca787deb98d3b982
	Library/metadata/45/45c31c2822912ed40be0ecb1969a7c17
	Library/metadata/4d/4db6fa6fe0209ec439cd0fa02f23e310
	Library/metadata/4e/4e1467e748fa74c64b96759b3d9713ae
	Library/metadata/52/527393b10fb66418bbaa072e104f5a30
	Library/metadata/54/54216e9ed42974e30967824b7f0b2806
	Library/metadata/56/569a998a7b8b80547a9c5cc36ab7b7d0
	Library/metadata/57/5710a1f47af2947699139509aae39149
	Library/metadata/57/576afb797ad2fa84cbe51ac6ebbfaffc
	Library/metadata/58/588bfc487cd289d43ba581459eac4332
	Library/metadata/59/598aae44ac09b064da43e38011cb4e80
	Library/metadata/5f/5f32776e6f3e6464191e1cc146b4eaf5
	Library/metadata/60/607426a9820414bfd8081fb22854dbd4
	Library/metadata/61/6134a184b1d49498fb473b6276533784
	Library/metadata/62/62091ab9c9712294ab6d96ba6c6bfe9e
	Library/metadata/63/63e618e4b55634c8fb3bf5c5cd6679ea
	Library/metadata/66/66207ff69de6b4d73a445036c3a195f6
	Library/metadata/66/6685d213dcd37451eaa7643f63089046
	Library/metadata/66/66db6959866182d40b7b14128834508f
	Library/metadata/6a/6aa58ee2f84094af2846e1a7bb0c23f9
	Library/metadata/6d/6d55b5e91b95c41739cdf4f804dd383d
	Library/metadata/6e/6eb91ab72913e7145b8ba9519dd35473
	Library/metadata/6f/6f7b92c3250ca17418029746df6d6e89
	Library/metadata/70/7097f369c5ba74821bd76c430889322a
	Library/metadata/72/7289bc5ea5b8b0c4a8d1e66539bc08b8
	Library/metadata/73/73604ae94aea741dfa9b7732c8994b19
	Library/metadata/73/7373ee5e27ee13c4eafd521433e54db0
	Library/metadata/74/7493eb164e32a564389fcac02567cfe9
	Library/metadata/7d/7dd8e5d81b906c442a79594a8f48d4df
	Library/metadata/7e/7e0b0a994d8934541a387e092630b5db
	Library/metadata/7e/7e6f84bf81c8d4de280f1133cff7e601
	Library/metadata/82/8269a010592f549af8f11b1683d9e794
	Library/metadata/83/8393efedccb532c4587f98e9cd6ecbbc
	Library/metadata/84/84b455cffa1d3fd46b4ab95a817b77f4
	Library/metadata/86/8631bbf8b17c499428a234ca13ec7055
	Library/metadata/86/8636e662e0f7d440fa257e9dce592504
	Library/metadata/86/86e946deb8cff7f4c9037e2cc19f3006
	Library/metadata/87/87f06cb275750b3459b890438b8c911f
	Library/metadata/89/899280a18c5c5c4438d05730060f6624
	Library/metadata/8a/8af0f21f411904d65a90f87110818a7e
	Library/metadata/8c/8c75dadc1f18e42f5be29942a71d83c4
	Library/metadata/92/92192b93e894d4f4db81d1a2daab1953
	Library/metadata/92/92527e15a920ffa4c9b390cc7e385494
	Library/metadata/92/929f91fdec048b747b1588625b8fad51
	Library/metadata/93/93331e832301b09499e8f3189bb0a437
	Library/metadata/93/93add3cd8e9e99a4a9b5ef7727d4c020
	Library/metadata/93/93d55f9ef09ae59449cf110526faf5f9
	Library/metadata/94/942556e411bec8b44b8d342fa8888fa1
	Library/metadata/94/94c2a1532d7e42a47a37d373ec7389d8
	Library/metadata/99/99babbf7886b42d4b84693d3ee21b45e
	Library/metadata/99/99fc1c643a8a26d468ac61e8a55b066d
	Library/metadata/9a/9a59d4872d73b416f8e0c2c4ca57fbe2
	Library/metadata/9a/9a77469520696474486ab72058e12f82
	Library/metadata/9e/9ef50104b12ed4ca9bed40f105986cd7
	Library/metadata/9f/9f212f8afc177064db8576329b215ba5
	Library/metadata/9f/9fadc0eecbffa4c95a05ce54af27726c
	Library/metadata/a2/a279128aaf9154942b0a61460eb7af50
	Library/metadata/a3/a3e68e378c886c24888b418b6b82f1e0
	Library/metadata/a4/a40c1b84cf7fe418bae97a29041b85a4
	Library/metadata/a4/a4d6b98dee35a1c42b74c58a7b85654a
	Library/metadata/a7/a771af3b1958445078af5fe2e9ec726c
	Library/metadata/a8/a81b4e60662f79e4ea601ed77ff993ff
	Library/metadata/aa/aaa57a8987adf6846961a2e771d4c18b
	Library/metadata/ac/ac865f55780124eeabc4a99d6d0b0115
	Library/metadata/ac/ace217fa8cf37dd4493b70150c6e5386
	Library/metadata/ae/aeac948117d49f34a808ab9df65dcf8c
	Library/metadata/b1/b1f4aac2c6667456c80bc8ab9bac6ed1
	Library/metadata/b2/b2145489f7c704db8acb14a52bddeee9
	Library/metadata/b3/b365e6042890d4b1987423ed6bb8a08c
	Library/metadata/b3/b3f15bb4cbdddd54bb0cff62bccd24a5
	Library/metadata/b4/b470d7ceac5762c428e152653ec8be59
	Library/metadata/b4/b492a439c5177c84681dda995dedca97
	Library/metadata/b5/b5b8c0f9acc2944f086c02cb83f4ae76
	Library/metadata/b6/b64cd7c7b84bee04f97a3ae82dafff76
	Library/metadata/bb/bbb4b67d6f8bc4949b588c29acfbb245
	Library/metadata/bd/bd53624d13d834f41864ad27cead96a1
	Library/metadata/bd/bd85507caa7c7a3438074ea047e8381e
	Library/metadata/be/be8d644f4fd253841a41a71cccb568f5
	Library/metadata/c2/c22094bc116524b2a95c9aae09278b22
	Library/metadata/c5/c5311e90c1bfc9747bd3e59cb44f3759
	Library/metadata/c6/c60d549d7b8ffdd479e6bedd2605e659
	Library/metadata/c8/c81df2918c80c054ca3d436e62090893
	Library/metadata/ca/caa52b9eef66c904f902110c18760ba3
	Library/metadata/ca/cad4fe3deabb0452e9a372244c25287c
	Library/metadata/cb/cba4562cece794697b418ce8e7c04b3c
	Library/metadata/cf/cfab43c6ef9972e4cab9270d93a61b52
	Library/metadata/d1/d1ff7b89b177ffc48947bcd9fc66959f
	Library/metadata/d2/d2107cc5a8e63264ebc6d462963f43a8
	Library/metadata/d4/d4c9195f27743714c92a63e6688de6a9
	Library/metadata/d6/d6e0c95a128e14227939c51b5d9ad74e
	Library/metadata/d6/d6ef58fc6f637406bbe6814a19c377f8
	Library/metadata/d9/d9cccf980fcb7441d85b8b3b5c2d2c34
	Library/metadata/d9/d9e48a8585f7d8e478d3488a2769f67f
	Library/metadata/da/daf8ab28ea6df4773bf38cb9e3e173e1
	Library/metadata/db/db647e4e28a345e4c86a1edbceaabd83
	Library/metadata/db/dbbcbe629574042c382ffc6790e6925a
	Library/metadata/dc/dc4d848003371b1438774a47185d82c4
	Library/metadata/dd/dd74aac4327d94547b669e05edb71852
	Library/metadata/de/de5e4b734991bef49b77848b38a2de8c
	Library/metadata/de/de981508eeef7924497fb76b156b2429
	Library/metadata/e5/e53c8c3dcc4ff59438bc9e86cb45c3f6
	Library/metadata/e7/e7059a73938784f43b19d8e6e6de7487
	Library/metadata/e7/e70b47c0cfc1d4b12a3c663d7582a523
	Library/metadata/ea/ea2d1bbb5e181c4489dfc3fee899d86d
	Library/metadata/f2/f2af333648c334319bd43c214449ab50
	Library/metadata/f5/f5dba8644555f9346879581da9f3a703
	Library/metadata/f5/f5e6edc4d569e444abb70fab5dc6f5bd
	Library/metadata/f6/f66eb67b12004f5488c149d2fae40c0d
	Library/metadata/f7/f761e1507b4a2754db3f384b7c58086d
	Library/metadata/f7/f781c091d1c8647c380d5230adfaee54
	Library/metadata/f8/f808a361300df7746b9132fbb08a3128
	Library/metadata/f9/f9372f23586ef470b97d53856af88487
	Library/metadata/fb/fb889794293599f469205ef76ed3c6c4
	Library/metadata/fb/fbcb491f2058ea5498853619e10c09e5
	Library/metadata/fc/fcaf69de2f5fa854ca21619b1fa03f66
	Library/metadata/fe/fe5d00245bc1d42a7927f4b2879026b8
	Library/metadata/fe/fea30afd1c7394b4f9b8e6cc2b7094df
	Library/metadata/ff/ff063c9db7e6e467d86d376ff5be5ca0
	Library/metadata/ff/ffb93f9fe6598d847aad589cdf59c33c
	Library/shadercompiler-1.log