Conflicts: README.md Solved
|
||
1 |
|
|
2 |
|
|
3 |
|
|
4 |
|
|
5 |
|
|
6 |
|
|
7 |
|
|
8 |
|
|
9 |
|
|
10 |
|
|
11 |
|
|
12 |
|
|
13 |
|
|
14 |
|
|
15 |
|
|
16 |
|
|
17 |
|
|
18 |
|
|
19 |
|
|
20 |
|
|
21 |
|
|
22 |
|
|
23 |
|
|
24 |
|
|
25 |
|
|
26 |
|
|
27 |
|
|
28 |
|
|
29 |
|
|
30 |
|
|
31 |
|
|
32 |
|
|
33 |
|
|
34 |
|
|
35 |
|
|
36 |
|
|
37 |
|
|
38 |
|
|
39 |
|
|
40 |
|
|
41 |
|
|
42 |
|
|
43 |
|
|
44 |
|
|
45 |
|
|
46 |
|
|
47 |
|
|
48 |
|
|
49 |
|
|
50 |
|
|
51 |
|
|
52 |
|
|
53 |
|
|
54 |
|
|
55 |
|
|
56 |
|
|
57 |
|
|
58 |
|
|
59 |
|
|
60 |
|
|
61 |
|
|
62 |
|
|
63 |
|
|
64 |
|
|
65 |
|
|
66 |
|
|
67 |
|
|
68 |
|
|
69 |
|
|
70 |
|
|
71 |
|
|
72 |
|
|
73 |
|
|
74 |
|
|
75 |
|
|
76 |
|
|
||
390 | 390 |
|
391 | 391 |
|
392 | 392 |
|
393 |
|
|
394 |
|
|
395 |
|
|
396 |
|
|
397 |
|
|
398 |
|
|
399 |
|
|
400 |
|
|
401 |
|
|
402 |
|
|
403 |
|
|
404 | 393 |
|
405 | 394 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
209 | 208 |
|
210 | 209 |
|
211 | 210 |
|
212 |
|
|
211 |
|
|
213 | 212 |
|
214 | 213 |
|
215 | 214 |
|
|
||
67 | 67 |
|
68 | 68 |
|
69 | 69 |
|
70 |
|
|
71 |
|
|
72 |
|
|
70 | 73 |
|
71 | 74 |
|
72 | 75 |
|
|
||
165 | 168 |
|
166 | 169 |
|
167 | 170 |
|
171 |
|
|
172 |
|
|
173 |
|
|
174 |
|
|
168 | 175 |
|
169 | 176 |
|
170 | 177 |
|
|
||
326 | 333 |
|
327 | 334 |
|
328 | 335 |
|
336 |
|
|
337 |
|
|
338 |
|
|
339 |
|
|
329 | 340 |
|
341 |
|
|
330 | 342 |
|
331 | 343 |
|
332 | 344 |
|
|
||
459 | 471 |
|
460 | 472 |
|
461 | 473 |
|
474 |
|
|
475 |
|
|
462 | 476 |
|
463 | 477 |
|
464 | 478 |
|
|
||
629 | 643 |
|
630 | 644 |
|
631 | 645 |
|
646 |
|
|
647 |
|
|
648 |
|
|
649 |
|
|
650 |
|
|
651 |
|
|
652 |
|
|
653 |
|
|
632 | 654 |
|
633 | 655 |
|
634 | 656 |
|
|
||
100 | 100 |
|
101 | 101 |
|
102 | 102 |
|
103 |
|
|
104 |
|
|
105 |
|
|
106 |
|
|
107 |
|
|
108 |
|
|
109 |
|
|
110 |
|
|
111 |
|
|
112 |
|
|
113 |
|
|
114 |
|
|
115 |
|
|
116 |
|
|
117 |
|
|
118 |
|
|
119 |
|
|
120 |
|
|
121 |
|
|
122 |
|
|
123 |
|
|
124 |
|
|
125 |
|
|
126 |
|
|
127 |
|
|
103 | 128 |
|
104 | 129 |
|
105 | 130 |
|
|
||
242 | 242 |
|
243 | 243 |
|
244 | 244 |
|
245 |
|
|
246 |
|
|
245 | 247 |
|
246 | 248 |
|
247 | 249 |
|
|
||
248 | 248 |
|
249 | 249 |
|
250 | 250 |
|
251 |
|
|
252 |
|
|
251 | 253 |
|
252 | 254 |
|
253 | 255 |
|
|
||
393 | 395 |
|
394 | 396 |
|
395 | 397 |
|
398 |
|
|
396 | 399 |
|
400 |
|
|
397 | 401 |
|
398 | 402 |
|
399 | 403 |
|
|
||
653 | 657 |
|
654 | 658 |
|
655 | 659 |
|
660 |
|
|
656 | 661 |
|
657 | 662 |
|
658 | 663 |
|
659 | 664 |
|
665 |
|
|
660 | 666 |
|
661 | 667 |
|
662 | 668 |
|
|
||
762 | 768 |
|
763 | 769 |
|
764 | 770 |
|
765 |
|
|
771 |
|
|
766 | 772 |
|
773 |
|
|
767 | 774 |
|
768 | 775 |
|
769 | 776 |
|
|
||
973 | 980 |
|
974 | 981 |
|
975 | 982 |
|
976 |
|
|
983 |
|
|
977 | 984 |
|
978 | 985 |
|
979 | 986 |
|
|
||
1166 | 1173 |
|
1167 | 1174 |
|
1168 | 1175 |
|
1176 |
|
|
1169 | 1177 |
|
1170 | 1178 |
|
1171 | 1179 |
|
|
||
1183 | 1191 |
|
1184 | 1192 |
|
1185 | 1193 |
|
1194 |
|
|
1186 | 1195 |
|
1187 | 1196 |
|
1188 | 1197 |
|
|
||
1387 | 1396 |
|
1388 | 1397 |
|
1389 | 1398 |
|
1390 |
|
|
1399 |
|
|
1391 | 1400 |
|
1392 |
|
|
1401 |
|
|
1393 | 1402 |
|
1394 |
|
|
1403 |
|
|
1395 | 1404 |
|
1396 | 1405 |
|
1397 | 1406 |
|
|
||
1487 | 1496 |
|
1488 | 1497 |
|
1489 | 1498 |
|
1499 |
|
|
1500 |
|
|
1501 |
|
|
1490 | 1502 |
|
1491 | 1503 |
|
1492 | 1504 |
|
|
||
1512 | 1524 |
|
1513 | 1525 |
|
1514 | 1526 |
|
1527 |
|
|
1528 |
|
|
1529 |
|
|
1530 |
|
|
1531 |
|
|
1532 |
|
|
1533 |
|
|
1534 |
|
|
1535 |
|
|
1536 |
|
|
1537 |
|
|
1538 |
|
|
1539 |
|
|
1540 |
|
|
1541 |
|
|
1542 |
|
|
1543 |
|
|
1544 |
|
|
1545 |
|
|
1546 |
|
|
1547 |
|
|
1515 | 1548 |
|
1516 | 1549 |
|
1517 | 1550 |
|
|
||
1754 | 1787 |
|
1755 | 1788 |
|
1756 | 1789 |
|
1757 |
|
|
1790 |
|
|
1758 | 1791 |
|
1759 | 1792 |
|
1760 | 1793 |
|
|
||
1944 | 1977 |
|
1945 | 1978 |
|
1946 | 1979 |
|
1947 |
|
|
1980 |
|
|
1948 | 1981 |
|
1949 | 1982 |
|
1950 | 1983 |
|
|
||
2083 | 2116 |
|
2084 | 2117 |
|
2085 | 2118 |
|
2119 |
|
|
2120 |
|
|
2121 |
|
|
2086 | 2122 |
|
2087 | 2123 |
|
2088 | 2124 |
|
|
||
2124 | 2160 |
|
2125 | 2161 |
|
2126 | 2162 |
|
2163 |
|
|
2127 | 2164 |
|
2128 | 2165 |
|
2129 | 2166 |
|
|
||
2133 | 2170 |
|
2134 | 2171 |
|
2135 | 2172 |
|
2173 |
|
|
2136 | 2174 |
|
2175 |
|
|
2176 |
|
|
2137 | 2177 |
|
2138 | 2178 |
|
2139 | 2179 |
|
|
||
2190 | 2230 |
|
2191 | 2231 |
|
2192 | 2232 |
|
2193 |
|
|
2194 |
|
|
2195 |
|
|
2233 |
|
|
2234 |
|
|
2235 |
|
|
2236 |
|
|
2237 |
|
|
2196 | 2238 |
|
2197 |
|
|
2198 |
|
|
2199 |
|
|
2200 |
|
|
2201 |
|
|
2202 |
|
|
2203 |
|
|
2204 |
|
|
2205 |
|
|
2206 |
|
|
2207 |
|
|
2239 |
|
|
2240 |
|
|
2241 |
|
|
2242 |
|
|
2243 |
|
|
2244 |
|
|
2208 | 2245 |
|
2246 |
|
|
2247 |
|
|
2248 |
|
|
2249 |
|
|
2250 |
|
|
2251 |
|
|
2252 |
|
|
2253 |
|
|
2209 | 2254 |
|
2210 | 2255 |
|
2211 | 2256 |
|
|
||
2248 | 2293 |
|
2249 | 2294 |
|
2250 | 2295 |
|
2251 |
|
|
2252 | 2296 |
|
2253 | 2297 |
|
2254 | 2298 |
|
2255 | 2299 |
|
2256 | 2300 |
|
2257 |
|
|
2258 | 2301 |
|
2259 | 2302 |
|
2260 | 2303 |
|
|
||
2341 | 2384 |
|
2342 | 2385 |
|
2343 | 2386 |
|
2344 |
|
|
2387 |
|
|
2345 | 2388 |
|
2346 | 2389 |
|
2347 | 2390 |
|
|
||
2357 | 2400 |
|
2358 | 2401 |
|
2359 | 2402 |
|
2360 |
|
|
2403 |
|
|
2361 | 2404 |
|
2362 |
|
|
2363 |
|
|
2405 |
|
|
2406 |
|
|
2364 | 2407 |
|
2365 |
|
|
2408 |
|
|
2366 | 2409 |
|
2367 | 2410 |
|
2368 | 2411 |
|
|
||
2381 | 2424 |
|
2382 | 2425 |
|
2383 | 2426 |
|
2384 |
|
|
2427 |
|
|
2385 | 2428 |
|
2386 | 2429 |
|
2387 | 2430 |
|
2388 | 2431 |
|
2389 |
|
|
2390 |
|
|
2432 |
|
|
2391 | 2433 |
|
2392 | 2434 |
|
2393 | 2435 |
|
2394 | 2436 |
|
2395 |
|
|
2396 |
|
|
2397 |
|
|
2398 |
|
|
2437 |
|
|
2438 |
|
|
2439 |
|
|
2440 |
|
|
2441 |
|
|
2442 |
|
|
2399 | 2443 |
|
2400 |
|
|
2401 |
|
|
2402 |
|
|
2444 |
|
|
2445 |
|
|
2446 |
|
|
2447 |
|
|
2403 | 2448 |
|
2404 | 2449 |
|
2405 | 2450 |
|
|
||
3452 | 3497 |
|
3453 | 3498 |
|
3454 | 3499 |
|
3500 |
|
|
3501 |
|
|
3502 |
|
|
3503 |
|
|
3504 |
|
|
3455 | 3505 |
|
3456 | 3506 |
|
3457 | 3507 |
|
|
||
3645 | 3695 |
|
3646 | 3696 |
|
3647 | 3697 |
|
3698 |
|
|
3699 |
|
|
3700 |
|
|
3701 |
|
|
3702 |
|
|
3703 |
|
|
3704 |
|
|
3705 |
|
|
3706 |
|
|
3707 |
|
|
3648 | 3708 |
|
3649 | 3709 |
|
3650 | 3710 |
|
|
||
4894 | 4954 |
|
4895 | 4955 |
|
4896 | 4956 |
|
4957 |
|
|
4958 |
|
|
4959 |
|
|
4960 |
|
|
4897 | 4961 |
|
4898 | 4962 |
|
4899 | 4963 |
|
|
||
193 | 193 |
|
194 | 194 |
|
195 | 195 |
|
196 |
|
|
197 | 196 |
|
198 | 197 |
|
199 | 198 |
|
|
||
218 | 217 |
|
219 | 218 |
|
220 | 219 |
|
221 |
|
|
220 |
|
|
222 | 221 |
|
223 | 222 |
|
224 | 223 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
199 | 198 |
|
200 | 199 |
|
201 | 200 |
|
202 |
|
|
201 |
|
|
203 | 202 |
|
204 | 203 |
|
205 | 204 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
199 | 198 |
|
200 | 199 |
|
201 | 200 |
|
202 |
|
|
201 |
|
|
203 | 202 |
|
204 | 203 |
|
205 | 204 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
215 | 214 |
|
216 | 215 |
|
217 | 216 |
|
218 |
|
|
217 |
|
|
219 | 218 |
|
220 | 219 |
|
221 | 220 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
214 | 213 |
|
215 | 214 |
|
216 | 215 |
|
217 |
|
|
216 |
|
|
218 | 217 |
|
219 | 218 |
|
220 | 219 |
|
|
||
202 | 202 |
|
203 | 203 |
|
204 | 204 |
|
205 |
|
|
206 | 205 |
|
207 | 206 |
|
208 | 207 |
|
|
||
238 | 237 |
|
239 | 238 |
|
240 | 239 |
|
241 |
|
|
240 |
|
|
242 | 241 |
|
243 | 242 |
|
244 | 243 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
214 | 213 |
|
215 | 214 |
|
216 | 215 |
|
217 |
|
|
216 |
|
|
218 | 217 |
|
219 | 218 |
|
220 | 219 |
|
|
||
217 | 217 |
|
218 | 218 |
|
219 | 219 |
|
220 |
|
|
221 | 220 |
|
222 | 221 |
|
223 | 222 |
|
|
||
242 | 241 |
|
243 | 242 |
|
244 | 243 |
|
245 |
|
|
244 |
|
|
246 | 245 |
|
247 | 246 |
|
248 | 247 |
|
|
||
218 | 218 |
|
219 | 219 |
|
220 | 220 |
|
221 |
|
|
222 | 221 |
|
223 | 222 |
|
224 | 223 |
|
|
||
243 | 242 |
|
244 | 243 |
|
245 | 244 |
|
246 |
|
|
245 |
|
|
247 | 246 |
|
248 | 247 |
|
249 | 248 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
209 | 208 |
|
210 | 209 |
|
211 | 210 |
|
212 |
|
|
211 |
|
|
213 | 212 |
|
214 | 213 |
|
215 | 214 |
|
|
||
184 | 184 |
|
185 | 185 |
|
186 | 186 |
|
187 |
|
|
188 | 187 |
|
189 | 188 |
|
190 | 189 |
|
|
||
214 | 213 |
|
215 | 214 |
|
216 | 215 |
|
217 |
|
|
216 |
|
|
218 | 217 |
|
219 | 218 |
|
220 | 219 |
|
|
||
131 | 131 |
|
132 | 132 |
|
133 | 133 |
|
134 |
|
|
134 | 135 |
|
135 | 136 |
|
136 | 137 |
|
|
||
178 | 178 |
|
179 | 179 |
|
180 | 180 |
|
181 |
|
|
182 |
|
|
183 |
|
|
184 |
|
|
185 |
|
|
186 |
|
|
187 |
|
|
188 |
|
|
189 |
|
|
190 |
|
|
191 |
|
|
192 |
|
|
193 |
|
|
194 |
|
|
195 |
|
|
196 |
|
|
197 |
|
|
198 |
|
|
199 |
|
|
200 |
|
|
201 |
|
|
202 |
|
|
203 |
|
|
204 |
|
|
205 |
|
|
206 |
|
|
207 |
|
|
208 |
|
|
209 |
|
|
181 | 210 |
|
182 | 211 |
|
183 | 212 |
|
|
||
48 | 48 |
|
49 | 49 |
|
50 | 50 |
|
51 |
|
|
52 |
|
|
53 |
|
|
54 |
|
|
55 |
|
|
56 |
|
|
51 | 57 |
|
52 | 58 |
|
53 | 59 |
|
|
||
84 | 90 |
|
85 | 91 |
|
86 | 92 |
|
93 |
|
|
87 | 94 |
|
95 |
|
|
96 |
|
|
97 |
|
|
98 |
|
|
99 |
|
|
88 | 100 |
|
89 | 101 |
|
90 | 102 |
|
|
||
128 | 140 |
|
129 | 141 |
|
130 | 142 |
|
131 |
|
|
143 |
|
|
144 |
|
|
145 |
|
|
146 |
|
|
147 |
|
|
148 |
|
|
149 |
|
|
150 |
|
|
151 |
|
|
152 |
|
|
153 |
|
|
154 |
|
|
155 |
|
|
156 |
|
|
157 |
|
|
158 |
|
|
159 |
|
|
132 | 160 |
|
133 | 161 |
|
134 | 162 |
|
|
||
465 | 493 |
|
466 | 494 |
|
467 | 495 |
|
468 |
|
|
469 |
|
|
470 |
|
|
471 |
|
|
472 |
|
|
496 |
|
|
473 | 497 |
|
474 |
|
|
475 |
|
|
476 |
|
|
498 |
|
|
499 |
|
|
500 |
|
|
501 |
|
|
502 |
|
|
503 |
|
|
504 |
|
|
505 |
|
|
506 |
|
|
507 |
|
|
508 |
|
|
509 |
|
|
510 |
|
|
511 |
|
|
512 |
|
|
513 |
|
|
514 |
|
|
515 |
|
|
516 |
|
|
517 |
|
|
518 |
|
|
519 |
|
|
520 |
|
|
521 |
|
|
477 | 522 |
|
478 | 523 |
|
479 | 524 |
|
480 | 525 |
|
481 |
|
|
482 |
|
|
483 |
|
|
484 |
|
|
485 |
|
|
526 |
|
|
486 | 527 |
|
487 | 528 |
|
488 | 529 |
|
489 |
|
|
530 |
|
|
531 |
|
|
532 |
|
|
533 |
|
|
534 |
|
|
535 |
|
|
536 |
|
|
537 |
|
|
538 |
|
|
539 |
|
|
540 |
|
|
541 |
|
|
542 |
|
|
543 |
|
|
544 |
|
|
545 |
|
|
546 |
|
|
547 |
|
|
548 |
|
|
549 |
|
|
550 |
|
|
551 |
|
|
552 |
|
|
553 |
|
|
554 |
|
|
555 |
|
|
490 | 556 |
|
491 | 557 |
|
492 | 558 |
|
|
||
845 | 911 |
|
846 | 912 |
|
847 | 913 |
|
914 |
|
|
915 |
|
|
916 |
|
|
917 |
|
|
918 |
|
|
919 |
|
|
920 |
|
|
848 | 921 |
|
849 | 922 |
|
850 | 923 |
|
|
||
1174 | 1247 |
|
1175 | 1248 |
|
1176 | 1249 |
|
1250 |
|
|
1251 |
|
|
1252 |
|
|
1253 |
|
|
1254 |
|
|
1255 |
|
|
||
97 | 97 |
|
98 | 98 |
|
99 | 99 |
|
100 |
|
|
101 |
|
|
102 |
|
|
103 |
|
|
104 |
|
|
105 |
|
|
100 | 106 |
|
101 | 107 |
|
102 | 108 |
|
|
||
45 | 45 |
|
46 | 46 |
|
47 | 47 |
|
48 |
|
|
49 |
|
|
50 |
|
|
51 |
|
|
48 | 52 |
|
49 | 53 |
|
50 | 54 |
|
|
||
576 | 580 |
|
577 | 581 |
|
578 | 582 |
|
583 |
|
|
584 |
|
|
585 |
|
|
586 |
|
|
587 |
|
|
588 |
|
|
579 | 589 |
|
580 | 590 |
|
581 | 591 |
|
|
||
607 | 617 |
|
608 | 618 |
|
609 | 619 |
|
610 |
|
|
620 |
|
|
611 | 621 |
|
612 | 622 |
|
613 | 623 |
|
|
||
1162 | 1172 |
|
1163 | 1173 |
|
1164 | 1174 |
|
1175 |
|
|
1176 |
|
|
1177 |
|
|
1178 |
|
|
1179 |
|
|
1180 |
|
|
1181 |
|
|
1182 |
|
|
1183 |
|
|
1184 |
|
|
1185 |
|
|
1186 |
|
|
1187 |
|
|
1188 |
|
|
1189 |
|
|
1190 |
|
|
1191 |
|
|
1192 |
|
|
1193 |
|
|
1194 |
|
|
1195 |
|
|
1196 |
|
|
1197 |
|
|
1198 |
|
|
1199 |
|
|
1200 |
|
|
1201 |
|
|
1202 |
|
|
1165 | 1203 |
|
1166 | 1204 |
|
1167 | 1205 |
|
1168 | 1206 |
|
1169 |
|
|
1170 |
|
|
1171 |
|
|
1172 |
|
|
1173 |
|
|
1174 |
|
|
1175 | 1207 |
|
1176 | 1208 |
|
1177 |
|
|
1178 |
|
|
1179 | 1209 |
|
1180 | 1210 |
|
1181 | 1211 |
|
|
||
1478 | 1508 |
|
1479 | 1509 |
|
1480 | 1510 |
|
1481 |
|
|
1482 |
|
|
1483 |
|
|
1484 |
|
|
1485 |
|
|
1486 |
|
|
1487 |
|
|
1488 |
|
|
1489 |
|
|
1490 |
|
|
1491 |
|
|
1492 |
|
|
1493 |
|
|
1494 |
|
|
1495 |
|
|
1496 |
|
|
1511 |
|
|
1497 | 1512 |
|
1498 | 1513 |
|
1499 | 1514 |
|
|
||
1506 | 1521 |
|
1507 | 1522 |
|
1508 | 1523 |
|
1509 |
|
|
1510 |
|
|
1511 |
|
|
1512 |
|
|
1513 |
|
|
1524 |
|
|
1514 | 1525 |
|
1515 | 1526 |
|
1516 | 1527 |
|
|
||
204 | 204 |
|
205 | 205 |
|
206 | 206 |
|
207 |
|
|
207 |
|
|
208 | 208 |
|
209 | 209 |
|
210 | 210 |
|
|
||
11 | 11 |
|
12 | 12 |
|
13 | 13 |
|
14 |
|
|
14 | 15 |
|
15 | 16 |
|
16 | 17 |
|