You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/06/30 17:12:55 UTC

incubator-tinkerpop git commit: fixed up old diagrams. fixed a bug in the step-types diagram as realized by @dkuppitz.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master a6b969dae -> 060093546


fixed up old diagrams. fixed a bug in the step-types diagram as realized by @dkuppitz.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/06009354
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/06009354
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/06009354

Branch: refs/heads/master
Commit: 0600935464b73f330ff662654bc4d9c735825e90
Parents: a6b969d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 30 09:12:55 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 30 09:12:55 2015 -0600

----------------------------------------------------------------------
 docs/static/images/choose-step.png    |  Bin 120817 -> 118627 bytes
 docs/static/images/has-step.png       |  Bin 92883 -> 93721 bytes
 docs/static/images/step-types.png     |  Bin 129946 -> 129207 bytes
 docs/static/images/tinkerpop3.graffle | 1124 +++++++++++++++-------------
 4 files changed, 615 insertions(+), 509 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06009354/docs/static/images/choose-step.png
----------------------------------------------------------------------
diff --git a/docs/static/images/choose-step.png b/docs/static/images/choose-step.png
index 24c7a80..40c7bb3 100644
Binary files a/docs/static/images/choose-step.png and b/docs/static/images/choose-step.png differ

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06009354/docs/static/images/has-step.png
----------------------------------------------------------------------
diff --git a/docs/static/images/has-step.png b/docs/static/images/has-step.png
index d498f1d..93fa9e5 100644
Binary files a/docs/static/images/has-step.png and b/docs/static/images/has-step.png differ

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06009354/docs/static/images/step-types.png
----------------------------------------------------------------------
diff --git a/docs/static/images/step-types.png b/docs/static/images/step-types.png
index 4c9f1cd..c65fe19 100644
Binary files a/docs/static/images/step-types.png and b/docs/static/images/step-types.png differ

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/06009354/docs/static/images/tinkerpop3.graffle
----------------------------------------------------------------------
diff --git a/docs/static/images/tinkerpop3.graffle b/docs/static/images/tinkerpop3.graffle
index e52a193..0bdf9b8 100644
--- a/docs/static/images/tinkerpop3.graffle
+++ b/docs/static/images/tinkerpop3.graffle
@@ -20,11 +20,265 @@
 	<key>GuidesVisible</key>
 	<string>YES</string>
 	<key>ImageCounter</key>
-	<integer>92</integer>
+	<integer>96</integer>
 	<key>Images</key>
 	<array>
 		<dict>
 			<key>Extension</key>
+			<string>pdf</string>
+			<key>ID</key>
+			<integer>95</integer>
+			<key>RawData</key>
+			<data>
+			JVBERi0xLjQKJcfsj6IKNSAwIG9iago8PC9MZW5ndGggNiAwIFIv
+			RmlsdGVyIC9GbGF0ZURlY29kZT4+CnN0cmVhbQp4nK1Ty0oEMRA8
+			eMtXxNusMG13nt0+LsIiiBc1t8HTigvCCov/D3ZmZnHHnTkIEkIC
+			XdWpKjp7i0AW6xrPzc5cPme7/TJo73Vvzd5QD7DjsdnZu6IgtkQg
+			MTpb3s1AJkuOIZC3KRDEEGzZma55WbUIDpGcvJYHpWqnYy6Bo6T0
+			8maa81X5qAg3QURwOTnrAkSUiusark1ZFMK1KSHkhIp+NOWia26m
+			VadqSORQvZpWf3shwMxinQNPiYfnTj0Em0EyUqVkcLYlyOJzHPDU
+			44VT8nOeGTD6avKHc7DOJ84jD+F0zboXjhgpjl3TkQoBn2oGAbxn
+			Nwo/qxSvwiXMeG010hCRVT1D5jBwNB81Dog8XBNoVv21tmhVFEsi
+			5Sg56GUhIZ5LyEke8J8Vn0QkLCQkMaO3R5z/TUgwLSQ0Hb4A2TsV
+			4nX4aKRIpYi+kmVm+G6n1V/Ddz2tnvwGDxJqcjnTMOvLtvVL/NG2
+			+Chh1va6mCdd37Px13llbmRzdHJlYW0KZW5kb2JqCjYgMCBvYmoK
+			Mzc1CmVuZG9iago0IDAgb2JqCjw8L1R5cGUvUGFnZS9NZWRpYUJv
+			eCBbMCAwIDYxMiA3OTJdCi9Sb3RhdGUgMC9QYXJlbnQgMyAwIFIK
+			L1Jlc291cmNlczw8L1Byb2NTZXRbL1BERiAvVGV4dF0KL0V4dEdT
+			dGF0ZSAyMCAwIFIKL0ZvbnQgMjEgMCBSCj4+Ci9Db250ZW50cyA1
+			IDAgUgo+PgplbmRvYmoKMyAwIG9iago8PCAvVHlwZSAvUGFnZXMg
+			L0tpZHMgWwo0IDAgUgpdIC9Db3VudCAxCi9Dcm9wQm94IFsxMjgu
+			MDI0IDYyMi4wMzQgMjU0LjMzMiA2NjcuMDM2XQo+PgplbmRvYmoK
+			MSAwIG9iago8PC9UeXBlIC9DYXRhbG9nIC9QYWdlcyAzIDAgUgov
+			TWV0YWRhdGEgMzIgMCBSCj4+CmVuZG9iago3IDAgb2JqCjw8L1R5
+			cGUvRXh0R1N0YXRlCi9PUE0gMQovVEsgdHJ1ZT4+ZW5kb2JqCjIw
+			IDAgb2JqCjw8L1I3CjcgMCBSPj4KZW5kb2JqCjIxIDAgb2JqCjw8
+			L1IxMgoxMiAwIFIvUjE0CjE0IDAgUi9SOAo4IDAgUi9SMTYKMTYg
+			MCBSL1IxMAoxMCAwIFIvUjE4CjE4IDAgUj4+CmVuZG9iagoxMiAw
+			IG9iago8PC9CYXNlRm9udC9VQ1FKQkkrQ01FWDEwL0ZvbnREZXNj
+			cmlwdG9yIDEzIDAgUi9UeXBlL0ZvbnQKL0ZpcnN0Q2hhciA1Ni9M
+			YXN0Q2hhciA2MS9XaWR0aHNbIDg4OCA4ODggODg4IDg4OCA4ODgg
+			ODg4XQovRW5jb2RpbmcgMjggMCBSL1N1YnR5cGUvVHlwZTE+Pgpl
+			bmRvYmoKMjggMCBvYmoKPDwvVHlwZS9FbmNvZGluZy9CYXNlRW5j
+			b2RpbmcvV2luQW5zaUVuY29kaW5nL0RpZmZlcmVuY2VzWwo1Ni9i
+			cmFjZWxlZnR0cC9icmFjZXJpZ2h0dHAvYnJhY2VsZWZ0YnQvYnJh
+			Y2VyaWdodGJ0L2JyYWNlbGVmdG1pZC9icmFjZXJpZ2h0bWlkXT4+
+			CmVuZG9iagoxNCAwIG9iago8PC9CYXNlRm9udC9BUUFFVUMrQ01S
+			OC9Gb250RGVzY3JpcHRvciAxNSAwIFIvVHlwZS9Gb250Ci9GaXJz
+			dENoYXIgNDkvTGFzdENoYXIgNDkvV2lkdGhzWyA1MzFdCi9FbmNv
+			ZGluZy9XaW5BbnNpRW5jb2RpbmcvU3VidHlwZS9UeXBlMT4+CmVu
+			ZG9iago4IDAgb2JqCjw8L0Jhc2VGb250L0lPWVdRTitDTU1JMTIv
+			Rm9udERlc2NyaXB0b3IgOSAwIFIvVHlwZS9Gb250Ci9GaXJzdENo
+			YXIgNTgvTGFzdENoYXIgODMvV2lkdGhzWyAyNzEgMCAwIDAgMCAw
+			CjAgMCAwIDAgMCA3MjQgMCAwIDAgMCAwIDAgMCAwIDAgMAowIDAg
+			MCA2MDJdCi9FbmNvZGluZyAyOSAwIFIvU3VidHlwZS9UeXBlMT4+
+			CmVuZG9iagoyOSAwIG9iago8PC9UeXBlL0VuY29kaW5nL0Jhc2VF
+			bmNvZGluZy9XaW5BbnNpRW5jb2RpbmcvRGlmZmVyZW5jZXNbCjU4
+			L3BlcmlvZF0+PgplbmRvYmoKMTYgMCBvYmoKPDwvQmFzZUZvbnQv
+			T1RMUk9LK0NNU1k4L0ZvbnREZXNjcmlwdG9yIDE3IDAgUi9UeXBl
+			L0ZvbnQKL0ZpcnN0Q2hhciAzL0xhc3RDaGFyIDMvV2lkdGhzWyA1
+			MzFdCi9FbmNvZGluZyAzMCAwIFIvU3VidHlwZS9UeXBlMT4+CmVu
+			ZG9iagozMCAwIG9iago8PC9UeXBlL0VuY29kaW5nL0Jhc2VFbmNv
+			ZGluZy9XaW5BbnNpRW5jb2RpbmcvRGlmZmVyZW5jZXNbCjMvYXN0
+			ZXJpc2ttYXRoXT4+CmVuZG9iagoxMCAwIG9iago8PC9CYXNlRm9u
+			dC9JU1ZXRUcrQ01TWTEwL0ZvbnREZXNjcmlwdG9yIDExIDAgUi9U
+			eXBlL0ZvbnQKL0ZpcnN0Q2hhciAzMy9MYXN0Q2hhciAzMy9XaWR0
+			aHNbIDEwMDBdCi9FbmNvZGluZyAzMSAwIFIvU3VidHlwZS9UeXBl
+			MT4+CmVuZG9iagozMSAwIG9iago8PC9UeXBlL0VuY29kaW5nL0Jh
+			c2VFbmNvZGluZy9XaW5BbnNpRW5jb2RpbmcvRGlmZmVyZW5jZXNb
+			CjMzL2Fycm93cmlnaHRdPj4KZW5kb2JqCjE4IDAgb2JqCjw8L0Jh
+			c2VGb250L0FVRU5RSCtDTU1JOC9Gb250RGVzY3JpcHRvciAxOSAw
+			IFIvVHlwZS9Gb250Ci9GaXJzdENoYXIgMTEwL0xhc3RDaGFyIDEx
+			MC9XaWR0aHNbIDY0NF0KL0VuY29kaW5nL1dpbkFuc2lFbmNvZGlu
+			Zy9TdWJ0eXBlL1R5cGUxPj4KZW5kb2JqCjEzIDAgb2JqCjw8L1R5
+			cGUvRm9udERlc2NyaXB0b3IvRm9udE5hbWUvVUNRSkJJK0NNRVgx
+			MC9Gb250QkJveFswIC0xODEwIDcxOCAxMF0vRmxhZ3MgNAovQXNj
+			ZW50IDEwCi9DYXBIZWlnaHQgMTAKL0Rlc2NlbnQgLTE4MTAKL0l0
+			YWxpY0FuZ2xlIDAKL1N0ZW1WIDEwNwovTWlzc2luZ1dpZHRoIDUw
+			MAovQ2hhclNldCgvYnJhY2VsZWZ0YnQvYnJhY2VsZWZ0bWlkL2Jy
+			YWNlbGVmdHRwL2JyYWNlcmlnaHRidC9icmFjZXJpZ2h0bWlkL2Jy
+			YWNlcmlnaHR0cCkvRm9udEZpbGUzIDIyIDAgUj4+CmVuZG9iagoy
+			MiAwIG9iago8PC9GaWx0ZXIvRmxhdGVEZWNvZGUKL1N1YnR5cGUv
+			VHlwZTFDL0xlbmd0aCA2NjU+PnN0cmVhbQp4nF2QX0hTURzH79F1
+			73VNM3EYdN3OS6kg/iOwORVyKUEaLSnsz4Obu7nh5t2uRy+jCJMg
+			ueekESoRjJm0QUUQ5dMM8THwJehBIUIIoTfp7dx5hnSniLqHw/n+
+			fvw45/P5Ac5SxAEABE9f90BzUz5eMM4DQyoyqouxZOxk/fOnsK0Y
+			2yzp7PcKmjlLP52hqXKuBABl/NnLxPvltXWPEo2roeEggrVDdbDZ
+			5Wqthy1NTS54JSKroSHfKOzzoaAc8SGzCMN+ZSgkozisbQ8iFG1r
+			bNQ0rcEXGWtQ1OHOunqohVAQ3pLHZHVCDsAeZRTBG76IDA8QGw4u
+			jxKJjiNZhX1KQFZH/apvSN5nQNGjHAkFjgo/2s9h+eHhTD4ejuSz
+			H3Ecx7s63Jfb2zigAwwIeAFmwCwnmEviLFwvtwI40A2WQc6YLtu1
+			7Z1bzO4kgVFJbcVG5Z5gjxE97Vjn04SknEaXgGlNJ/WyESqKj/mY
+			rqM40WennR/Qz4FMY/r2xw7MONF8RzKMRYnfOnyJSLuf7XgrQQO0
+			l8KFOUJwAid0MjkXS/as3f8X+KVt423RcAspnUQd1/morsecuTYB
+			s9JVNkgRk9gEq77H/JhZRbN/HCuPXXUcO9dvx5fG2E12lZU/earr
+			OC4ioqccb3gapuIG9ZoWoilz/K9Cd5K7a8e/39J+2kMrXs/ngcUl
+			naiORzwbYWIn82JWI+a6CkkKxCulbMnJHZpOtHSADjJEJTpBq79R
+			P6ZW0eyfUHcLuDXOAqyXwcmpvAI2N70wldJ+3Fm5+MWdbMEtYoF4
+			9tpelf0dIUvmYp/POMNLntUHfwMb2ib+U2hrcmNWu8m8dIQJYpmW
+			5CUWTwoZa+a0w2qJK7aSr69sNvOUctx/rjVpBAplbmRzdHJlYW0K
+			ZW5kb2JqCjE1IDAgb2JqCjw8L1R5cGUvRm9udERlc2NyaXB0b3Iv
+			Rm9udE5hbWUvQVFBRVVDK0NNUjgvRm9udEJCb3hbMCAwIDQ0NyA2
+			NjVdL0ZsYWdzIDY1NTY4Ci9Bc2NlbnQgNjY1Ci9DYXBIZWlnaHQg
+			NjY1Ci9EZXNjZW50IDAKL0l0YWxpY0FuZ2xlIDAKL1N0ZW1WIDY3
+			Ci9NaXNzaW5nV2lkdGggNTAwCi9DaGFyU2V0KC9vbmUpL0ZvbnRG
+			aWxlMyAyMyAwIFI+PgplbmRvYmoKMjMgMCBvYmoKPDwvRmlsdGVy
+			L0ZsYXRlRGVjb2RlCi9TdWJ0eXBlL1R5cGUxQy9MZW5ndGggMzI0
+			Pj5zdHJlYW0KeJxjZGBhYmBkZGR19g2yADHUf0gz/pBh+iHL3N39
+			I/inLmsPD2M3D3M3D8va7+uEvkcJfg/n/x4iwMDMyJhb2OCcX1BZ
+			lJmeUaKgkaypYGhpaa6jYGRgYKngmJtalJmcmKfgm1iSkZqbWALk
+			5CgE5ydnppZUKmjYZJSUFFjp65eXl+sl5hbr5Rel22nqKJRnlmQo
+			BKUWpxaVpaYouOXnlSj4JeamKoAcpwcinPNzC0pLUosUfPNTUovy
+			GBgYGA0ZGIQYmBgZWfx/dPD9WN695sfqNdvnM36vv8X8/dxPQdFl
+			nT0FcknJYcU63RxZ7Mu6D3YfXcbxZyp7Wke9jlxGFtuWvofdO4Dw
+			UfeWjr08ymsy2HU6pm+Q5ytb8MN51vf8qZMXsP1OnMa+hus6txwX
+			i/l8Hs7lE3h4rs/m4WVgAABiJXDjCmVuZHN0cmVhbQplbmRvYmoK
+			OSAwIG9iago8PC9UeXBlL0ZvbnREZXNjcmlwdG9yL0ZvbnROYW1l
+			L0lPWVdRTitDTU1JMTIvRm9udEJCb3hbMCAtMjEgNzUzIDcwNF0v
+			RmxhZ3MgNjU1NDAKL0FzY2VudCA3MDQKL0NhcEhlaWdodCA3MDQK
+			L0Rlc2NlbnQgLTIxCi9JdGFsaWNBbmdsZSAwCi9TdGVtViAxMTIK
+			L01pc3NpbmdXaWR0aCA1MDAKL0NoYXJTZXQoL0UvUy9wZXJpb2Qp
+			L0ZvbnRGaWxlMyAyNCAwIFI+PgplbmRvYmoKMjQgMCBvYmoKPDwv
+			RmlsdGVyL0ZsYXRlRGVjb2RlCi9TdWJ0eXBlL1R5cGUxQy9MZW5n
+			dGggNzAyPj5zdHJlYW0KeJwlj11IU3EYxs9xc55saBZCYp0dKCpJ
+			5geFKGHJUBIzI4u6EGqtg1PaR9txp5mazs2z83/Px5xzfahtciJm
+			kHhRkBR1E0bhRXTXVR9XERZ09d/heNHUq/d5eXgenh9JmIsIkiRL
+			HN3dnQ2NW/JwvprMHyjKHzRBSI/pl4rBagKreUlv24tdFbivHF/Z
+			Q5hI0jcUdfj84cBAv5tjjrlqmIbm5qZaprG+vplp87CBAZfTy3Q7
+			OTfrcXKF5xbT63MNsFyYOXbKzXH+lro6nuftTk/Q7gv0t9bUMvwA
+			52YuskE2EGJvMh0+L8ecd3pYZmebfec4fB7/EMcGmG7fTTbgJQjC
+			1N7bQhBHiBNE+TYNYSb+kS/IL/l4me6GHP6UwyvPyFX9sknvwiOV
+			kqIkQaUSQiImiCgep0UEYoS/YDDXe4wTQBlHLKMgQkwal5AMM5CU
+			p+XUZ5zb/9fydXrYMwGRqMcmCkiAOBVNxKdTUvKhSr/HI8VblREk
+			jAo038oPNQJVa/mIUWpZVl5AFT5kweVPBk8j8AmDNiSgGIjUZCGf
+			VNUFmc5iByjyLMhV6QiE6c0Ry50JCI8nYf4jRMenkBAftxnVmysR
+			tzjRDlXb5jRkbHlkWQRJSs5RZfm/oZze8JTEHWs4vmbSy/WuylQU
+			ClPRyD06Fr1xBaHB9c60s8C4zygxKKP4zKtrb4ZtaWHt7lL07egD
+			ITukTmU46KPsJ48fba5fxubHqqbM0qBICZApVUxMRpA4LNBXDScg
+			YQxQVWQGZFWSHt2nVz9o/e9cvwqolbgUV+CKlxMr7IotlA0n6rSz
+			CxElPDc8P6bBc+rb9x+//6z21N6e8oNAFxqUlKTMqXQZ1mCD/Llh
+			wudeV+aCmaCXDwa9Gq/lMppGl4WyecdsOo39WYtxfbZksXR9N11q
+			bspYdy0mrVaC+A8HfDcxCmVuZHN0cmVhbQplbmRvYmoKMTcgMCBv
+			YmoKPDwvVHlwZS9Gb250RGVzY3JpcHRvci9Gb250TmFtZS9PVExS
+			T0srQ01TWTgvRm9udEJCb3hbMCAwIDQ2MCA0NjVdL0ZsYWdzIDQK
+			L0FzY2VudCA0NjUKL0NhcEhlaWdodCA0NjUKL0Rlc2NlbnQgMAov
+			SXRhbGljQW5nbGUgMAovU3RlbVYgNjkKL01pc3NpbmdXaWR0aCA1
+			MDAKL0NoYXJTZXQoL2FzdGVyaXNrbWF0aCkvRm9udEZpbGUzIDI1
+			IDAgUj4+CmVuZG9iagoyNSAwIG9iago8PC9GaWx0ZXIvRmxhdGVE
+			ZWNvZGUKL1N1YnR5cGUvVHlwZTFDL0xlbmd0aCA0MjI+PnN0cmVh
+			bQp4nGNkYGFiYGRkZHP2DY60ALHUf0gz/pBh+iHL3N39I+FHKmsP
+			D2M3D3M3D8vCHzJC37MEv6fzf08RYGBhZMwrbupzzi+oLMpMzyhR
+			0EjWVDC0tDTXUTAyMLBUcMxNLcpMTsxT8E0syUjNTSwBcnIUgvOT
+			M1NLKhU0bDJKSgqs9PXLy8v1EnOL9fKL0u00dRTKM0syFIJSi1OL
+			ylJTFNzy80oU/BJzUxXAztMDk875uQWlJalFCr75KalFeYnFQHZm
+			cTbQhgwGBgZGZgbGLgYmRkaWtT86+H4sX7vgh9R8xu8NR5l/GH6X
+			EJ3S2tc9oZtj9swZc+c19tdMkvdYVTwtav53zgMSk/vmTZncN3Vi
+			39TuKRzTW+flyv1W0Zz5XaN3TueSvG7Jyu7amr5ajnr2mb81f0s+
+			b5rY0d3WLVldW1dZMbV9Vov8uZzFDXvKf3OGSTR3VDQ1dzS2djR2
+			N3FUzqybPbm3e+4Sue/st2t+m7KWz2maMWPOlPlT21d3TZdrX9ux
+			sWMdB1/x4p/2C9h+y01n38m1k3vnXB4eIOZlYAAA9zijbQplbmRz
+			dHJlYW0KZW5kb2JqCjExIDAgb2JqCjw8L1R5cGUvRm9udERlc2Ny
+			aXB0b3IvRm9udE5hbWUvSVNWV0VHK0NNU1kxMC9Gb250QkJveFsw
+			IC0xMSA5NDMgNTExXS9GbGFncyA0Ci9Bc2NlbnQgNTExCi9DYXBI
+			ZWlnaHQgNTExCi9EZXNjZW50IC0xMQovSXRhbGljQW5nbGUgMAov
+			U3RlbVYgMTQxCi9NaXNzaW5nV2lkdGggNTAwCi9DaGFyU2V0KC9h
+			cnJvd3JpZ2h0KS9Gb250RmlsZTMgMjYgMCBSPj4KZW5kb2JqCjI2
+			IDAgb2JqCjw8L0ZpbHRlci9GbGF0ZURlY29kZQovU3VidHlwZS9U
+			eXBlMUMvTGVuZ3RoIDM1Nz4+c3RyZWFtCnicY2RgYWJgZGRkd/YN
+			jjQ0ADHVf0gz/pBh+iHL3N3wy/nHZNYeHsZuHuZuHpaV328Jfc8W
+			/J7B/z1VgIGFkTG/tKXPOb+gsigzPaNEQSNZU8HQ0tJcR8HIwMBS
+			wTE3tSgzOTFPwTexJCM1N7EEyMlRCM5PzkwtqVTQsMkoKSmw0tcv
+			Ly/XS8wt1ssvSrfT1FEozyzJUAhKLU4tKktNUXDLzytR8EvMTVWA
+			uE8PQjnn5xaUlqQWKfjmp6QW5SUWFeWXg93AwMDAqMjA2MXAxMjI
+			kvWjg+9XzfeqzYyHf3Ex/7z2vUo0JLEgqbkuzq3Zp7uLo3569+Q5
+			Pb1z++UWvT12/zvrzun9fb3dk7ontfZ19sTP+c27N/W7Tcf0rr6q
+			bo7m+u76zik+Wz3k5+euyNiWzfG3mq2ysru8fG73XHm+4sU/7Rey
+			/Zaexr6ZazO3HBeLWFo9D+fm2Tw8QMzLwAAA7NWEBwplbmRzdHJl
+			YW0KZW5kb2JqCjE5IDAgb2JqCjw8L1R5cGUvRm9udERlc2NyaXB0
+			b3IvRm9udE5hbWUvQVVFTlFIK0NNTUk4L0ZvbnRCQm94WzAgLTEw
+			IDYxMiA0NDFdL0ZsYWdzIDEzMTEwNAovQXNjZW50IDQ0MQovQ2Fw
+			SGVpZ2h0IDQ0MQovRGVzY2VudCAtMTAKL0l0YWxpY0FuZ2xlIDAK
+			L1N0ZW1WIDkxCi9NaXNzaW5nV2lkdGggNTAwCi9YSGVpZ2h0IDQ0
+			MQovQ2hhclNldCgvbikvRm9udEZpbGUzIDI3IDAgUj4+CmVuZG9i
+			agoyNyAwIG9iago8PC9GaWx0ZXIvRmxhdGVEZWNvZGUKL1N1YnR5
+			cGUvVHlwZTFDL0xlbmd0aCA0NDI+PnN0cmVhbQp4nGNkYGFiYGRk
+			ZHP29fW0ALHUf0gz/pBh+iHL3N3448cPX9YeHsZuHuZuHpaVP1SF
+			vscKfo/i/x4uwMDMyJhX3OScX1BZlJmeUaKgkaypYGhpaa6jYGRg
+			YKngmJtalJmcmKfgm1iSkZqbWALk5CgE5ydnppZUKmjYZJSUFFjp
+			65eXl+sl5hbr5Rel22nqKJRnlmQoBKUWpxaVpaYouOXnlSj4Jeam
+			KoBdpwcmnfNzC0pLUosUfPNTUovyGBgYGIGEPwMTIyPL4R8dfD8l
+			Gpf/kF/O+EP4woTLzN9jvluI9s2aurFv1syD3T2L1qzZs2v7uW6O
+			9QvKYkISf7NVRMnXZXW3dtdxBO3K3/Z2y3eFGVOb+1rqO1saO+SK
+			LRNTUrs5qpunLlo0eeHUJfKzNm7/zt59mONa+Hpnq/Co1Dy5lkPx
+			qyO607uLSqpzimMaI7s7OZomtU+e0dO/dJLc9D1zj23t5lg6sai0
+			sq2iOUu+s7kmoL027beWRHtNa1F3O0fJvOYZc2dNnz5Jrm/i5LUT
+			FnDwlS344Tx12rTvBQvYfidMZV/NdZNbjovFfD4P5/J+Hh4GBgBt
+			iasgCmVuZHN0cmVhbQplbmRvYmoKMzIgMCBvYmoKPDwvVHlwZS9N
+			ZXRhZGF0YQovU3VidHlwZS9YTUwvTGVuZ3RoIDEzMTM+PnN0cmVh
+			bQo8P3hwYWNrZXQgYmVnaW49J++7vycgaWQ9J1c1TTBNcENlaGlI
+			enJlU3pOVGN6a2M5ZCc/Pgo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVz
+			Yz0iQ1JMRiI/Pgo8eDp4bXBtZXRhIHhtbG5zOng9J2Fkb2JlOm5z
+			Om1ldGEvJyB4OnhtcHRrPSdYTVAgdG9vbGtpdCAyLjkuMS0xMywg
+			ZnJhbWV3b3JrIDEuNic+CjxyZGY6UkRGIHhtbG5zOnJkZj0naHR0
+			cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5z
+			IycgeG1sbnM6aVg9J2h0dHA6Ly9ucy5hZG9iZS5jb20vaVgvMS4w
+			Lyc+CjxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSc5OTlhZWRh
+			MS01NzU2LTExZjAtMDAwMC0xM2FlOWJkZjMyNmMnIHhtbG5zOnBk
+			Zj0naHR0cDovL25zLmFkb2JlLmNvbS9wZGYvMS4zLycgcGRmOlBy
+			b2R1Y2VyPSdHUEwgR2hvc3RzY3JpcHQgOC43MCcvPgo8cmRmOkRl
+			c2NyaXB0aW9uIHJkZjphYm91dD0nOTk5YWVkYTEtNTc1Ni0xMWYw
+			LTAwMDAtMTNhZTliZGYzMjZjJyB4bWxuczp4bXA9J2h0dHA6Ly9u
+			cy5hZG9iZS5jb20veGFwLzEuMC8nPjx4bXA6TW9kaWZ5RGF0ZT4y
+			MDE1LTA2LTMwVDEwOjA5OjQ5LTA1OjAwPC94bXA6TW9kaWZ5RGF0
+			ZT4KPHhtcDpDcmVhdGVEYXRlPjIwMTUtMDYtMzBUMTA6MDk6NDkt
+			MDU6MDA8L3htcDpDcmVhdGVEYXRlPgo8eG1wOkNyZWF0b3JUb29s
+			PkRhdmlkIE0uIEpvbmVzPC94bXA6Q3JlYXRvclRvb2w+PC9yZGY6
+			RGVzY3JpcHRpb24+CjxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0
+			PSc5OTlhZWRhMS01NzU2LTExZjAtMDAwMC0xM2FlOWJkZjMyNmMn
+			IHhtbG5zOnhhcE1NPSdodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8x
+			LjAvbW0vJyB4YXBNTTpEb2N1bWVudElEPSc5OTlhZWRhMS01NzU2
+			LTExZjAtMDAwMC0xM2FlOWJkZjMyNmMnLz4KPHJkZjpEZXNjcmlw
+			dGlvbiByZGY6YWJvdXQ9Jzk5OWFlZGExLTU3NTYtMTFmMC0wMDAw
+			LTEzYWU5YmRmMzI2YycgeG1sbnM6ZGM9J2h0dHA6Ly9wdXJsLm9y
+			Zy9kYy9lbGVtZW50cy8xLjEvJyBkYzpmb3JtYXQ9J2FwcGxpY2F0
+			aW9uL3BkZic+PGRjOnRpdGxlPjxyZGY6QWx0PjxyZGY6bGkgeG1s
+			Omxhbmc9J3gtZGVmYXVsdCc+Q01NSTEyPC9yZGY6bGk+PC9yZGY6
+			QWx0PjwvZGM6dGl0bGU+PC9yZGY6RGVzY3JpcHRpb24+CjwvcmRm
+			OlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAg
+			ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+			ICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
+			ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+			ICAgICAgICAKPD94cGFja2V0IGVuZD0ndyc/PgplbmRzdHJlYW0K
+			ZW5kb2JqCjIgMCBvYmoKPDwvUHJvZHVjZXIoR1BMIEdob3N0c2Ny
+			aXB0IDguNzApCi9DcmVhdGlvbkRhdGUoRDoyMDE1MDYzMDEwMDk0
+			OS0wNScwMCcpCi9Nb2REYXRlKEQ6MjAxNTA2MzAxMDA5NDktMDUn
+			MDAnKQovVGl0bGUoQ01NSTEyKQovQ3JlYXRvcihEYXZpZCBNLiBK
+			b25lcyk+PmVuZG9iagp4cmVmCjAgMzMKMDAwMDAwMDAwMCA2NTUz
+			NSBmIAowMDAwMDAwNzQxIDAwMDAwIG4gCjAwMDAwMDg1NDggMDAw
+			MDAgbiAKMDAwMDAwMDYzOSAwMDAwMCBuIAowMDAwMDAwNDc5IDAw
+			MDAwIG4gCjAwMDAwMDAwMTUgMDAwMDAgbiAKMDAwMDAwMDQ2MCAw
+			MDAwMCBuIAowMDAwMDAwODA2IDAwMDAwIG4gCjAwMDAwMDE0NDgg
+			MDAwMDAgbiAKMDAwMDAwNDAxNyAwMDAwMCBuIAowMDAwMDAxOTcw
+			IDAwMDAwIG4gCjAwMDAwMDU3NDYgMDAwMDAgbiAKMDAwMDAwMDk3
+			MSAwMDAwMCBuIAowMDAwMDAyMzY1IDAwMDAwIG4gCjAwMDAwMDEy
+			OTUgMDAwMDAgbiAKMDAwMDAwMzQwMCAwMDAwMCBuIAowMDAwMDAx
+			NzM0IDAwMDAwIG4gCjAwMDAwMDUwMjUgMDAwMDAgbiAKMDAwMDAw
+			MjIwOSAwMDAwMCBuIAowMDAwMDA2NDA2IDAwMDAwIG4gCjAwMDAw
+			MDA4NTYgMDAwMDAgbiAKMDAwMDAwMDg4NiAwMDAwMCBuIAowMDAw
+			MDAyNjUxIDAwMDAwIG4gCjAwMDAwMDM2MDkgMDAwMDAgbiAKMDAw
+			MDAwNDIzOSAwMDAwMCBuIAowMDAwMDA1MjQwIDAwMDAwIG4gCjAw
+			MDAwMDU5NjUgMDAwMDAgbiAKMDAwMDAwNjYzMiAwMDAwMCBuIAow
+			MDAwMDAxMTM3IDAwMDAwIG4gCjAwMDAwMDE2NDYgMDAwMDAgbiAK
+			MDAwMDAwMTg3NyAwMDAwMCBuIAowMDAwMDAyMTE3IDAwMDAwIG4g
+			CjAwMDAwMDcxNTggMDAwMDAgbiAKdHJhaWxlcgo8PCAvU2l6ZSAz
+			MyAvUm9vdCAxIDAgUiAvSW5mbyAyIDAgUgovSUQgWzxEMDhGQTMy
+			MzQ0REJEOEZDRjNBOEYzRDAzQjNGMUM4Nj48RDA4RkEzMjM0NERC
+			RDhGQ0YzQThGM0QwM0IzRjFDODY+XQo+PgpzdGFydHhyZWYKODcx
+			MQolJUVPRgo=
+			</data>
+		</dict>
+		<dict>
+			<key>Extension</key>
 			<string>tiff</string>
 			<key>ID</key>
 			<integer>90</integer>
@@ -17276,229 +17530,6 @@
 		</dict>
 		<dict>
 			<key>Extension</key>
-			<string>tiff</string>
-			<key>ID</key>
-			<integer>60</integer>
-			<key>RawData</key>
-			<data>
-			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
-			AAcAAAxIAAAUSgAAAAAACAAIAAgACAAAAAgAAA3uAAAN5gAABYIA
-			AQABAAEAAQAADEhMaW5vAhAAAG1udHJSR0IgWFlaIAfOAAIACQAG
-			ADEAAGFjc3BNU0ZUAAAAAElFQyBzUkdCAAAAAAAAAAAAAAAAAAD2
-			1gABAAAAANMtSFAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-			AAAAAAAAAAAAAAAAAAAAAAAAAAAAEWNwcnQAAAFQAAAAM2Rlc2MA
-			AAGEAAAAbHd0cHQAAAHwAAAAFGJrcHQAAAIEAAAAFHJYWVoAAAIY
-			AAAAFGdYWVoAAAIsAAAAFGJYWVoAAAJAAAAAFGRtbmQAAAJUAAAA
-			cGRtZGQAAALEAAAAiHZ1ZWQAAANMAAAAhnZpZXcAAAPUAAAAJGx1
-			bWkAAAP4AAAAFG1lYXMAAAQMAAAAJHRlY2gAAAQwAAAADHJUUkMA
-			AAQ8AAAIDGdUUkMAAAQ8AAAIDGJUUkMAAAQ8AAAIDHRleHQAAAAA
-			Q29weXJpZ2h0IChjKSAxOTk4IEhld2xldHQtUGFja2FyZCBDb21w
-			YW55AABkZXNjAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAA
-			AAAAAAAAEnNSR0IgSUVDNjE5NjYtMi4xAAAAAAAAAAAAAAAAAAAA
-			AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYWVog
-			AAAAAAAA81EAAQAAAAEWzFhZWiAAAAAAAAAAAAAAAAAAAAAAWFla
-			IAAAAAAAAG+iAAA49QAAA5BYWVogAAAAAAAAYpkAALeFAAAY2lhZ
-			WiAAAAAAAAAkoAAAD4QAALbPZGVzYwAAAAAAAAAWSUVDIGh0dHA6
-			Ly93d3cuaWVjLmNoAAAAAAAAAAAAAAAWSUVDIGh0dHA6Ly93d3cu
-			aWVjLmNoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-			AAAAAAAAAAAAAAAAAGRlc2MAAAAAAAAALklFQyA2MTk2Ni0yLjEg
-			RGVmYXVsdCBSR0IgY29sb3VyIHNwYWNlIC0gc1JHQgAAAAAAAAAA
-			AAAALklFQyA2MTk2Ni0yLjEgRGVmYXVsdCBSR0IgY29sb3VyIHNw
-			YWNlIC0gc1JHQgAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAA
-			AAAAACxSZWZlcmVuY2UgVmlld2luZyBDb25kaXRpb24gaW4gSUVD
-			NjE5NjYtMi4xAAAAAAAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcg
-			Q29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAA
-			AAAAAAAAAAAAAAAAdmlldwAAAAAAE6T+ABRfLgAQzxQAA+3MAAQT
-			CwADXJ4AAAABWFlaIAAAAAAATAlWAFAAAABXH+dtZWFzAAAAAAAA
-			AAEAAAAAAAAAAAAAAAAAAAAAAAACjwAAAAJzaWcgAAAAAENSVCBj
-			dXJ2AAAAAAAABAAAAAAFAAoADwAUABkAHgAjACgALQAyADcAOwBA
-			AEUASgBPAFQAWQBeAGMAaABtAHIAdwB8AIEAhgCLAJAAlQCaAJ8A
-			pACpAK4AsgC3ALwAwQDGAMsA0ADVANsA4ADlAOsA8AD2APsBAQEH
-			AQ0BEwEZAR8BJQErATIBOAE+AUUBTAFSAVkBYAFnAW4BdQF8AYMB
-			iwGSAZoBoQGpAbEBuQHBAckB0QHZAeEB6QHyAfoCAwIMAhQCHQIm
-			Ai8COAJBAksCVAJdAmcCcQJ6AoQCjgKYAqICrAK2AsECywLVAuAC
-			6wL1AwADCwMWAyEDLQM4A0MDTwNaA2YDcgN+A4oDlgOiA64DugPH
-			A9MD4APsA/kEBgQTBCAELQQ7BEgEVQRjBHEEfgSMBJoEqAS2BMQE
-			0wThBPAE/gUNBRwFKwU6BUkFWAVnBXcFhgWWBaYFtQXFBdUF5QX2
-			BgYGFgYnBjcGSAZZBmoGewaMBp0GrwbABtEG4wb1BwcHGQcrBz0H
-			TwdhB3QHhgeZB6wHvwfSB+UH+AgLCB8IMghGCFoIbgiCCJYIqgi+
-			CNII5wj7CRAJJQk6CU8JZAl5CY8JpAm6Cc8J5Qn7ChEKJwo9ClQK
-			agqBCpgKrgrFCtwK8wsLCyILOQtRC2kLgAuYC7ALyAvhC/kMEgwq
-			DEMMXAx1DI4MpwzADNkM8w0NDSYNQA1aDXQNjg2pDcMN3g34DhMO
-			Lg5JDmQOfw6bDrYO0g7uDwkPJQ9BD14Peg+WD7MPzw/sEAkQJhBD
-			EGEQfhCbELkQ1xD1ERMRMRFPEW0RjBGqEckR6BIHEiYSRRJkEoQS
-			oxLDEuMTAxMjE0MTYxODE6QTxRPlFAYUJxRJFGoUixStFM4U8BUS
-			FTQVVhV4FZsVvRXgFgMWJhZJFmwWjxayFtYW+hcdF0EXZReJF64X
-			0hf3GBsYQBhlGIoYrxjVGPoZIBlFGWsZkRm3Gd0aBBoqGlEadxqe
-			GsUa7BsUGzsbYxuKG7Ib2hwCHCocUhx7HKMczBz1HR4dRx1wHZkd
-			wx3sHhYeQB5qHpQevh7pHxMfPh9pH5Qfvx/qIBUgQSBsIJggxCDw
-			IRwhSCF1IaEhziH7IiciVSKCIq8i3SMKIzgjZiOUI8Ij8CQfJE0k
-			fCSrJNolCSU4JWgllyXHJfcmJyZXJocmtyboJxgnSSd6J6sn3CgN
-			KD8ocSiiKNQpBik4KWspnSnQKgIqNSpoKpsqzysCKzYraSudK9Es
-			BSw5LG4soizXLQwtQS12Last4S4WLkwugi63Lu4vJC9aL5Evxy/+
-			MDUwbDCkMNsxEjFKMYIxujHyMioyYzKbMtQzDTNGM38zuDPxNCs0
-			ZTSeNNg1EzVNNYc1wjX9Njc2cjauNuk3JDdgN5w31zgUOFA4jDjI
-			OQU5Qjl/Obw5+To2OnQ6sjrvOy07azuqO+g8JzxlPKQ84z0iPWE9
-			oT3gPiA+YD6gPuA/IT9hP6I/4kAjQGRApkDnQSlBakGsQe5CMEJy
-			QrVC90M6Q31DwEQDREdEikTORRJFVUWaRd5GIkZnRqtG8Ec1R3tH
-			wEgFSEtIkUjXSR1JY0mpSfBKN0p9SsRLDEtTS5pL4kwqTHJMuk0C
-			TUpNk03cTiVObk63TwBPSU+TT91QJ1BxULtRBlFQUZtR5lIxUnxS
-			x1MTU19TqlP2VEJUj1TbVShVdVXCVg9WXFapVvdXRFeSV+BYL1h9
-			WMtZGllpWbhaB1pWWqZa9VtFW5Vb5Vw1XIZc1l0nXXhdyV4aXmxe
-			vV8PX2Ffs2AFYFdgqmD8YU9homH1YklinGLwY0Njl2PrZEBklGTp
-			ZT1lkmXnZj1mkmboZz1nk2fpaD9olmjsaUNpmmnxakhqn2r3a09r
-			p2v/bFdsr20IbWBtuW4SbmtuxG8eb3hv0XArcIZw4HE6cZVx8HJL
-			cqZzAXNdc7h0FHRwdMx1KHWFdeF2Pnabdvh3VnezeBF4bnjMeSp5
-			iXnnekZ6pXsEe2N7wnwhfIF84X1BfaF+AX5ifsJ/I3+Ef+WAR4Co
-			gQqBa4HNgjCCkoL0g1eDuoQdhICE44VHhauGDoZyhteHO4efiASI
-			aYjOiTOJmYn+imSKyoswi5aL/IxjjMqNMY2Yjf+OZo7OjzaPnpAG
-			kG6Q1pE/kaiSEZJ6kuOTTZO2lCCUipT0lV+VyZY0lp+XCpd1l+CY
-			TJi4mSSZkJn8mmia1ZtCm6+cHJyJnPedZJ3SnkCerp8dn4uf+qBp
-			oNihR6G2oiailqMGo3aj5qRWpMelOKWpphqmi6b9p26n4KhSqMSp
-			N6mpqhyqj6sCq3Wr6axcrNCtRK24ri2uoa8Wr4uwALB1sOqxYLHW
-			skuywrM4s660JbSctRO1irYBtnm28Ldot+C4WbjRuUq5wro7urW7
-			LrunvCG8m70VvY++Cr6Evv+/er/1wHDA7MFnwePCX8Lbw1jD1MRR
-			xM7FS8XIxkbGw8dBx7/IPci8yTrJuco4yrfLNsu2zDXMtc01zbXO
-			Ns62zzfPuNA50LrRPNG+0j/SwdNE08bUSdTL1U7V0dZV1tjXXNfg
-			2GTY6Nls2fHadtr724DcBdyK3RDdlt4c3qLfKd+v4DbgveFE4czi
-			U+Lb42Pj6+Rz5PzlhOYN5pbnH+ep6DLovOlG6dDqW+rl63Dr++yG
-			7RHtnO4o7rTvQO/M8Fjw5fFy8f/yjPMZ86f0NPTC9VD13vZt9vv3
-			ivgZ+Kj5OPnH+lf65/t3/Af8mP0p/br+S/7c/23//w==
-			</data>
-		</dict>
-		<dict>
-			<key>Extension</key>
 			<string>png</string>
 			<key>ID</key>
 			<integer>49</integer>
@@ -148438,7 +148469,7 @@
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2015-06-02 21:49:36 +0000</string>
+	<string>2015-06-30 15:11:23 +0000</string>
 	<key>Modifier</key>
 	<string>Marko Rodriguez</string>
 	<key>NotesVisible</key>
@@ -212521,8 +212552,8 @@ lang:java}</string>
 					<integer>154</integer>
 					<key>Points</key>
 					<array>
-						<string>{411.12995833633278, 249.17537096233991}</string>
-						<string>{393.34156685592797, 263.8246326463925}</string>
+						<string>{411.12995833633272, 249.17537096233991}</string>
+						<string>{393.34156685592802, 263.82463264639244}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -217507,8 +217538,8 @@ lang:java}</string>
 							<integer>142</integer>
 							<key>Points</key>
 							<array>
-								<string>{432.31558180663797, 157.68958738721886}</string>
-								<string>{428.44294795917932, 154.48274935358782}</string>
+								<string>{432.31558180663797, 157.68958738721889}</string>
+								<string>{428.44294795917938, 154.48274935358785}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -219136,7 +219167,7 @@ lang:java}</string>
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
 \f0\fs24 \cf1 has('name',\
-within,[vadas,josh])}</string>
+within(vadas,josh))}</string>
 					</dict>
 				</dict>
 				<dict>
@@ -228423,8 +228454,8 @@ endTime:2001}</string>
 					<integer>48</integer>
 					<key>Points</key>
 					<array>
-						<string>{207.56428733349856, 306.90079234700096}</string>
-						<string>{275.56067070483152, 339.75387073893648}</string>
+						<string>{207.56428733349856, 306.90079234700102}</string>
+						<string>{275.56067070483158, 339.75387073893654}</string>
 					</array>
 					<key>Style</key>
 					<dict>
@@ -230055,22 +230086,13 @@ endTime:2001}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{121.47336578369141, 91.82733154296875}, {11, 22}}</string>
+					<string>{{309.073974609375, 148.41815948486328}, {136.21464538574219, 48.265029907226562}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
-					<key>FitText</key>
-					<string>YES</string>
-					<key>Flow</key>
-					<string>Resize</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica-Bold</string>
-						<key>Size</key>
-						<real>18</real>
-					</dict>
 					<key>ID</key>
-					<integer>50</integer>
+					<integer>98</integer>
+					<key>ImageID</key>
+					<integer>95</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
@@ -230091,236 +230113,319 @@ endTime:2001}</string>
 							<string>NO</string>
 						</dict>
 					</dict>
+				</dict>
+				<dict>
+					<key>Bounds</key>
+					<string>{{428.28862762451172, 195.84234619140625}, {17, 17}}</string>
+					<key>Class</key>
+					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
+					<key>ID</key>
+					<integer>95</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
+					<key>Style</key>
+					<dict>
+						<key>fill</key>
+						<dict>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
+						</dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+					</dict>
 					<key>Text</key>
 					<dict>
-						<key>Pad</key>
-						<integer>0</integer>
 						<key>Text</key>
 						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
-\f0\fs36 \cf0 ?}</string>
+\f0\fs24 \cf0 E}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
-					<key>Wrap</key>
-					<string>NO</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{132.55970001220703, 101.82733154296875}, {11, 22}}</string>
+					<string>{{428.28862762451172, 221.68768310546875}, {17, 17}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
-					<key>FitText</key>
-					<string>YES</string>
-					<key>Flow</key>
-					<string>Resize</string>
 					<key>FontInfo</key>
 					<dict>
 						<key>Font</key>
-						<string>Helvetica-Bold</string>
+						<string>Helvetica</string>
 						<key>Size</key>
-						<real>18</real>
+						<real>12</real>
 					</dict>
 					<key>ID</key>
-					<integer>48</integer>
+					<integer>94</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Draws</key>
-							<string>NO</string>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
 					</dict>
 					<key>Text</key>
 					<dict>
-						<key>Pad</key>
-						<integer>0</integer>
 						<key>Text</key>
 						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
-\f0\fs36 \cf0 ?}</string>
+\f0\fs24 \cf0 E}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
-					<key>TextRotation</key>
-					<real>38.860763549804688</real>
-					<key>Wrap</key>
-					<string>NO</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{111.38703155517578, 98.82733154296875}, {11, 22}}</string>
+					<string>{{457.5, 202.84234619140625}, {17, 17}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
-					<key>FitText</key>
-					<string>YES</string>
-					<key>Flow</key>
-					<string>Resize</string>
 					<key>FontInfo</key>
 					<dict>
 						<key>Font</key>
-						<string>Helvetica-Bold</string>
+						<string>Helvetica</string>
 						<key>Size</key>
-						<real>18</real>
+						<real>12</real>
 					</dict>
 					<key>ID</key>
-					<integer>49</integer>
+					<integer>93</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Draws</key>
-							<string>NO</string>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
 					</dict>
 					<key>Text</key>
 					<dict>
-						<key>Pad</key>
-						<integer>0</integer>
 						<key>Text</key>
 						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
 \cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
-\f0\fs36 \cf0 ?}</string>
+\f0\fs24 \cf0 E}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
-					<key>TextRotation</key>
-					<real>321.5</real>
-					<key>Wrap</key>
-					<string>NO</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{434.20736694335938, 77.226072954985284}, {62.119400024414062, 14.86292393222177}}</string>
+					<string>{{450.12488555908203, 224.5150146484375}, {17, 17}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
 					<key>ID</key>
-					<integer>87</integer>
-					<key>ImageID</key>
-					<integer>64</integer>
+					<integer>92</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Draws</key>
-							<string>NO</string>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 E}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
 					</dict>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{241.51705932617188, 77.499997596218122}, {55, 14.315068493150685}}</string>
+					<string>{{440.49999237060547, 207.5150146484375}, {17, 17}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
 					<key>ID</key>
-					<integer>84</integer>
-					<key>ImageID</key>
-					<integer>63</integer>
+					<integer>91</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Draws</key>
-							<string>NO</string>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 E}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
 					</dict>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{32.7799072265625, 75.472727272727298}, {82, 16.027272727272727}}</string>
+					<string>{{418.49999237060547, 207.5150146484375}, {17, 17}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica</string>
+						<key>Size</key>
+						<real>12</real>
+					</dict>
 					<key>ID</key>
-					<integer>83</integer>
-					<key>ImageID</key>
-					<integer>62</integer>
+					<integer>90</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Draws</key>
-							<string>NO</string>
+							<key>Color</key>
+							<dict>
+								<key>b</key>
+								<string>0.994293</string>
+								<key>g</key>
+								<string>0.853217</string>
+								<key>r</key>
+								<string>0.622309</string>
+							</dict>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
+					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs24 \cf0 E}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
 					</dict>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{138.5596923828125, 174.35746765136719}, {54, 20.25}}</string>
+					<string>{{121.47336578369141, 91.82733154296875}, {11, 22}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>YES</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica-Bold</string>
+						<key>Size</key>
+						<real>18</real>
+					</dict>
 					<key>ID</key>
-					<integer>81</integer>
-					<key>ImageID</key>
-					<integer>61</integer>
+					<integer>50</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
@@ -230341,16 +230446,41 @@ endTime:2001}</string>
 							<string>NO</string>
 						</dict>
 					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Pad</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs36 \cf0 ?}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>Wrap</key>
+					<string>NO</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{348.27990722656261, 153.11638719312032}, {54, 39.133601752560928}}</string>
+					<string>{{132.55970001220703, 101.82733154296875}, {11, 22}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
+					<key>FitText</key>
+					<string>YES</string>
+					<key>Flow</key>
+					<string>Resize</string>
+					<key>FontInfo</key>
+					<dict>
+						<key>Font</key>
+						<string>Helvetica-Bold</string>
+						<key>Size</key>
+						<real>18</real>
+					</dict>
 					<key>ID</key>
-					<integer>80</integer>
-					<key>ImageID</key>
-					<integer>60</integer>
+					<integer>48</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
@@ -230371,10 +230501,28 @@ endTime:2001}</string>
 							<string>NO</string>
 						</dict>
 					</dict>
+					<key>Text</key>
+					<dict>
+						<key>Pad</key>
+						<integer>0</integer>
+						<key>Text</key>
+						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
+\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
+
+\f0\fs36 \cf0 ?}</string>
+						<key>VerticalPad</key>
+						<integer>0</integer>
+					</dict>
+					<key>TextRotation</key>
+					<real>38.860763549804688</real>
+					<key>Wrap</key>
+					<string>NO</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{444.3533935546875, 202.85136071081797}, {14, 19}}</string>
+					<string>{{111.38703155517578, 98.82733154296875}, {11, 22}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -230384,12 +230532,12 @@ endTime:2001}</string>
 					<key>FontInfo</key>
 					<dict>
 						<key>Font</key>
-						<string>Helvetica</string>
+						<string>Helvetica-Bold</string>
 						<key>Size</key>
-						<real>15</real>
+						<real>18</real>
 					</dict>
 					<key>ID</key>
-					<integer>79</integer>
+					<integer>49</integer>
 					<key>Shape</key>
 					<string>Rectangle</string>
 					<key>Style</key>
@@ -230420,175 +230568,133 @@ endTime:2001}</string>
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
-\f0\fs32 \cf0 ...}</string>
+\f0\fs36 \cf0 ?}</string>
 						<key>VerticalPad</key>
 						<integer>0</integer>
 					</dict>
+					<key>TextRotation</key>
+					<real>321.5</real>
 					<key>Wrap</key>
 					<string>NO</string>
 				</dict>
 				<dict>
+					<key>Bounds</key>
+					<string>{{434.20736694335938, 77.226072954985284}, {62.119400024414062, 14.86292393222177}}</string>
 					<key>Class</key>
-					<string>LineGraphic</string>
-					<key>Head</key>
-					<dict>
-						<key>ID</key>
-						<integer>75</integer>
-					</dict>
+					<string>ShapedGraphic</string>
 					<key>ID</key>
-					<integer>76</integer>
-					<key>Points</key>
-					<array>
-						<string>{407.95450850166287, 227.63551204733281}</string>
-						<string>{435.01771374457661, 236.22501585545811}</string>
-					</array>
+					<integer>87</integer>
+					<key>ImageID</key>
+					<integer>64</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
+						<key>fill</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
 						<key>stroke</key>
 						<dict>
-							<key>HeadArrow</key>
-							<string>FilledArrow</string>
-							<key>Legacy</key>
-							<true/>
-							<key>TailArrow</key>
-							<string>0</string>
+							<key>Draws</key>
+							<string>NO</string>
 						</dict>
 					</dict>
-					<key>Tail</key>
-					<dict>
-						<key>ID</key>
-						<integer>8</integer>
-					</dict>
 				</dict>
 				<dict>
+					<key>Bounds</key>
+					<string>{{241.51705932617188, 77.499997596218122}, {55, 14.315068493150685}}</string>
 					<key>Class</key>
-					<string>LineGraphic</string>
-					<key>Head</key>
-					<dict>
-						<key>ID</key>
-						<integer>71</integer>
-					</dict>
+					<string>ShapedGraphic</string>
 					<key>ID</key>
-					<integer>31</integer>
-					<key>Points</key>
-					<array>
-						<string>{407.87459404707761, 206.4107667908101}</string>
-						<string>{435.08782977420003, 197.34856705795002}</string>
-					</array>
+					<integer>84</integer>
+					<key>ImageID</key>
+					<integer>63</integer>
+					<key>Shape</key>
+					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
+						<key>fill</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
+						<key>shadow</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
 						<key>stroke</key>
 						<dict>
-							<key>HeadArrow</key>
-							<string>FilledArrow</string>
-							<key>Legacy</key>
-							<true/>
-							<key>TailArrow</key>
-							<string>0</string>
+							<key>Draws</key>
+							<string>NO</string>
 						</dict>
 					</dict>
-					<key>Tail</key>
-					<dict>
-						<key>ID</key>
-						<integer>8</integer>
-					</dict>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{434.76705932617188, 225.50602379675547}, {31.17266845703125, 31.17266845703125}}</string>
+					<string>{{32.7799072265625, 75.472727272727298}, {82, 16.027272727272727}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
 					<key>ID</key>
-					<integer>75</integer>
+					<integer>83</integer>
+					<key>ImageID</key>
+					<integer>62</integer>
 					<key>Shape</key>
-					<string>Circle</string>
+					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Color</key>
-							<dict>
-								<key>b</key>
-								<string>0.994293</string>
-								<key>g</key>
-								<string>0.853217</string>
-								<key>r</key>
-								<string>0.622309</string>
-							</dict>
+							<key>Draws</key>
+							<string>NO</string>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
-
-\f0\fs24 \cf0 S}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
+						<key>stroke</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
 					</dict>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{434.76705932617188, 176.67869225378672}, {31.17266845703125, 31.17266845703125}}</string>
+					<string>{{138.5596923828125, 174.35746765136719}, {54, 20.25}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
 					<key>ID</key>
-					<integer>71</integer>
+					<integer>81</integer>
+					<key>ImageID</key>
+					<integer>61</integer>
 					<key>Shape</key>
-					<string>Circle</string>
+					<string>Rectangle</string>
 					<key>Style</key>
 					<dict>
 						<key>fill</key>
 						<dict>
-							<key>Color</key>
-							<dict>
-								<key>b</key>
-								<string>0.994293</string>
-								<key>g</key>
-								<string>0.853217</string>
-								<key>r</key>
-								<string>0.622309</string>
-							</dict>
+							<key>Draws</key>
+							<string>NO</string>
 						</dict>
 						<key>shadow</key>
 						<dict>
 							<key>Draws</key>
 							<string>NO</string>
 						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf400
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
-
-\f0\fs24 \cf0 S}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
+						<key>stroke</key>
+						<dict>
+							<key>Draws</key>
+							<string>NO</string>
+						</dict>
 					</dict>
 				</dict>
 				<dict>
@@ -235989,7 +236095,7 @@ endTime:2001}</string>
 			<array>
 				<dict>
 					<key>Bounds</key>
-					<string>{{565.54510879516602, 285.87353515625}, {22, 14}}</string>
+					<string>{{568.54510879516602, 285.87353515625}, {22, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -236037,7 +236143,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{475.30437316488639, 282.35891723632812}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{478.30437316488639, 282.35891723632812}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236086,7 +236192,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{463.9161323506774, 292}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{466.9161323506774, 292}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236135,7 +236241,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{543.54512786865234, 248.35891723632812}, {37, 14}}</string>
+					<string>{{546.54512786865234, 248.35891723632812}, {37, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -236183,7 +236289,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{543.54512786865234, 276.35891723632812}, {22, 14}}</string>
+					<string>{{546.54512786865234, 276.35891723632812}, {22, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -236231,7 +236337,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{464.69265451025382, 269.64105224609375}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{467.69265451025382, 269.64105224609375}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236280,7 +236386,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{467.01758279394522, 239.64106750488281}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{470.01758279394522, 239.64106750488281}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236329,7 +236435,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{406.26700687408447, 283.15567016601562}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{409.26700687408447, 283.15567016601562}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236378,7 +236484,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{392.69324054312125, 248.5642401887838}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{395.69324054312125, 248.5642401887838}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236427,7 +236533,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{392.69321729730979, 276.3589179231588}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{395.69321729730979, 276.3589179231588}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236476,7 +236582,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{401.53056049346924, 236}, {20.717874149566725, 20.717874149566725}}</string>
+					<string>{{404.53056049346924, 236}, {20.717874149566725, 20.717874149566725}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FontInfo</key>
@@ -236525,7 +236631,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{492.99906396865845, 251.35891723632812}, {46.11966858316049, 36}}</string>
+					<string>{{495.99906396865845, 251.35891723632812}, {46.11966858316049, 36}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -236570,7 +236676,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{429.59593182288586, 270.95297693630096}, {32.158052799205166, 36}}</string>
+					<string>{{432.59593182288586, 270.95297693630096}, {32.158052799205166, 36}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -236615,7 +236721,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{260.69594466398178, 256.28213953395721}, {127.8375244140625, 36}}</string>
+					<string>{{259.69594466398178, 256.28213953395721}, {133.30406188964844, 36}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -236656,7 +236762,7 @@ endTime:2001}</string>
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
 
 \f0\fs24 \cf1 choose\
-(age.is(lte,30))}</string>
+(age.is(lte(30)))}</string>
 					</dict>
 				</dict>
 				<dict>
@@ -237203,7 +237309,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{554.54512786865234, 262.35891271213654}, {44, 14}}</string>
+					<string>{{557.54512786865234, 262.35891271213654}, {44, 14}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>FitText</key>
@@ -237300,7 +237406,7 @@ endTime:2001}</string>
 				</dict>
 				<dict>
 					<key>Bounds</key>
-					<string>{{429.59592938423157, 232}, {32.158052799205166, 36}}</string>
+					<string>{{432.59592938423157, 232}, {32.158052799205166, 36}}</string>
 					<key>Class</key>
 					<string>ShapedGraphic</string>
 					<key>ID</key>
@@ -248371,8 +248477,8 @@ endTime:2001}</string>
 							<integer>833</integer>
 							<key>Points</key>
 							<array>
-								<string>{105.52240409345089, 208.3100188124063}</string>
-								<string>{105.63736161214088, 212.65601058436027}</string>
+								<string>{105.52240409359131, 208.3100188124026}</string>
+								<string>{105.63736161238288, 212.65601058435394}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248404,8 +248510,8 @@ endTime:2001}</string>
 							<integer>834</integer>
 							<key>Points</key>
 							<array>
-								<string>{93.331422242694501, 215.70135517181907}</string>
-								<string>{98.654531776563232, 217.66213773229543}</string>
+								<string>{93.331422242694501, 215.70135517181905}</string>
+								<string>{98.654531776563246, 217.66213773229535}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248470,8 +248576,8 @@ endTime:2001}</string>
 							<integer>836</integer>
 							<key>Points</key>
 							<array>
-								<string>{100.21217967313551, 238.89697600430412}</string>
-								<string>{105.91488367655015, 245.27828248891961}</string>
+								<string>{100.21217967313549, 238.89697600430409}</string>
+								<string>{105.91488367655016, 245.27828248891961}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248503,8 +248609,8 @@ endTime:2001}</string>
 							<integer>837</integer>
 							<key>Points</key>
 							<array>
-								<string>{120.05186740422451, 243.60060619627876}</string>
-								<string>{113.08566765692628, 246.78076123896156}</string>
+								<string>{120.05186740422232, 243.60060619627387}</string>
+								<string>{113.08566765692294, 246.78076123895423}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248536,8 +248642,8 @@ endTime:2001}</string>
 							<integer>838</integer>
 							<key>Points</key>
 							<array>
-								<string>{130.57075904659965, 262.18129383349986}</string>
-								<string>{125.06911274671795, 263.81727596315619}</string>
+								<string>{130.57075904659945, 262.18129383349924}</string>
+								<string>{125.06911274671756, 263.81727596315488}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248734,8 +248840,8 @@ endTime:2001}</string>
 							<integer>844</integer>
 							<key>Points</key>
 							<array>
-								<string>{102.04876075037198, 226.96183305566305}</string>
-								<string>{99.433513363635484, 231.55140533750338}</string>
+								<string>{102.04876075036131, 226.96183305565694}</string>
+								<string>{99.433513363617422, 231.55140533749309}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248767,8 +248873,8 @@ endTime:2001}</string>
 							<integer>845</integer>
 							<key>Points</key>
 							<array>
-								<string>{93.502859594885948, 287.07465081581262}</string>
-								<string>{98.721662339029294, 286.85223980358506}</string>
+								<string>{93.502859594885948, 287.07465081581256}</string>
+								<string>{98.721662339029294, 286.85223980358495}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248800,8 +248906,8 @@ endTime:2001}</string>
 							<integer>846</integer>
 							<key>Points</key>
 							<array>
-								<string>{159.43731416844398, 205.84687674413351}</string>
-								<string>{162.35514899855204, 208.67371262441571}</string>
+								<string>{159.43731416861132, 205.84687674396088}</string>
+								<string>{162.35514899883253, 208.67371262412638}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248833,8 +248939,8 @@ endTime:2001}</string>
 							<integer>847</integer>
 							<key>Points</key>
 							<array>
-								<string>{161.23890209573511, 213.05815791220192}</string>
-								<string>{155.15923175171048, 214.74885405047979}</string>
+								<string>{161.23890209573509, 213.05815791220184}</string>
+								<string>{155.15923175171042, 214.74885405047957}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248866,8 +248972,8 @@ endTime:2001}</string>
 							<integer>848</integer>
 							<key>Points</key>
 							<array>
-								<string>{162.56243991002663, 222.63476962450844}</string>
-								<string>{166.19630038815231, 223.00523642985772}</string>
+								<string>{162.56243991010601, 222.63476962372508}</string>
+								<string>{166.19630038833412, 223.00523642806377}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248899,8 +249005,8 @@ endTime:2001}</string>
 							<integer>849</integer>
 							<key>Points</key>
 							<array>
-								<string>{168.79751790218569, 215.09708682805999}</string>
-								<string>{169.60972127491854, 215.93049760793886}</string>
+								<string>{168.79844896838691, 215.09617876829751}</string>
+								<string>{169.6108897272731, 215.92935645115611}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248932,8 +249038,8 @@ endTime:2001}</string>
 							<integer>850</integer>
 							<key>Points</key>
 							<array>
-								<string>{183.94266989972195, 233.83121750407022}</string>
-								<string>{184.80197409148121, 235.15160502678222}</string>
+								<string>{183.94268525930244, 233.83120748592341}</string>
+								<string>{184.80199155099149, 235.15159363886531}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248965,8 +249071,8 @@ endTime:2001}</string>
 							<integer>851</integer>
 							<key>Points</key>
 							<array>
-								<string>{175.24913559633674, 235.44080864614006}</string>
-								<string>{174.40161679655733, 239.40563625146311}</string>
+								<string>{175.24913559130115, 235.44080864506859}</string>
+								<string>{174.40161678974974, 239.4056362500146}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -248998,8 +249104,8 @@ endTime:2001}</string>
 							<integer>852</integer>
 							<key>Points</key>
 							<array>
-								<string>{173.92627550041144, 248.37919269658443}</string>
-								<string>{174.71179922360011, 255.85018463416199}</string>
+								<string>{173.92627550041155, 248.37919269658443}</string>
+								<string>{174.71179922360042, 255.85018463416199}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249484,8 +249590,8 @@ endTime:2001}</string>
 							<integer>866</integer>
 							<key>Points</key>
 							<array>
-								<string>{144.52797150194527, 248.24179542101859}</string>
-								<string>{148.15908380761638, 252.0047945100666}</string>
+								<string>{144.52797161920097, 248.24179530779296}</string>
+								<string>{148.15908396506234, 252.00479435803206}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249688,8 +249794,8 @@ endTime:2001}</string>
 							<integer>872</integer>
 							<key>Points</key>
 							<array>
-								<string>{158.30376898064847, 284.29023057663863}</string>
-								<string>{162.57830147880392, 287.45935177640627}</string>
+								<string>{158.30376898073899, 284.29023057651682}</string>
+								<string>{162.57830147897457, 287.45935177617662}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249721,8 +249827,8 @@ endTime:2001}</string>
 							<integer>873</integer>
 							<key>Points</key>
 							<array>
-								<string>{172.11503895894282, 281.36040749795336}</string>
-								<string>{171.04716735131561, 284.72172273572414}</string>
+								<string>{172.1150361194957, 281.36040659846549}</string>
+								<string>{171.04716374738874, 284.72172159406051}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249787,8 +249893,8 @@ endTime:2001}</string>
 							<integer>875</integer>
 							<key>Points</key>
 							<array>
-								<string>{143.63683094742933, 202.9738479099133}</string>
-								<string>{149.14894736922594, 202.34555356529458}</string>
+								<string>{143.63683094641897, 202.97384790099798}</string>
+								<string>{149.14894736778757, 202.34555355260292}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249820,8 +249926,8 @@ endTime:2001}</string>
 							<integer>876</integer>
 							<key>Points</key>
 							<array>
-								<string>{112.29024510429046, 216.18315254795115}</string>
-								<string>{119.58822618559682, 211.51538169691096}</string>
+								<string>{112.29024510426241, 216.18315254790735}</string>
+								<string>{119.58822618553698, 211.51538169681763}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249853,8 +249959,8 @@ endTime:2001}</string>
 							<integer>877</integer>
 							<key>Points</key>
 							<array>
-								<string>{120.8690014785291, 229.37865251403349}</string>
-								<string>{112.39567536115214, 224.26518328162206}</string>
+								<string>{120.86900147853892, 229.37865251401729}</string>
+								<string>{112.39567536116833, 224.26518328159528}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -249886,8 +249992,8 @@ endTime:2001}</string>
 							<integer>878</integer>
 							<key>Points</key>
 							<array>
-								<string>{82.683863250171271, 237.1012751020626}</string>
-								<string>{83.628230269371755, 245.16711254540442}</string>
+								<string>{82.6838632501738, 237.10127510206229}</string>
+								<string>{83.628230269377724, 245.16711254540371}</string>
 							</array>
 							<key>Style</key>
 							<dict>
@@ -256722,11 +256828,11 @@ edges}</string>
 	<key>WindowInfo</key>
 	<dict>
 		<key>CurrentSheet</key>
-		<integer>68</integer>
+		<integer>32</integer>
 		<key>ExpandedCanvases</key>
 		<array/>
 		<key>Frame</key>
-		<string>{{966, 313}, {1049, 900}}</string>
+		<string>{{1241, 100}, {1049, 900}}</string>
 		<key>ListView</key>
 		<true/>
 		<key>OutlineWidth</key>