Merge branch 'master' into j3rn-keymap

37 files changed, 10290 insertions, 2773 deletions

diff --git a/.gitignore b/.gitignore
index f3f46872a0..bae2658b00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.lst
 *.map
 *.sym
+*.swp
 tags
 *~
 build/
diff --git a/keyboard/ergodox_ez/Makefile b/keyboard/ergodox_ez/Makefile
index 3b70258402..03c806131d 100644
--- a/keyboard/ergodox_ez/Makefile
+++ b/keyboard/ergodox_ez/Makefile
@@ -94,13 +94,13 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
-CONSOLE_ENABLE   = yes # Console for debug(+400)
+CONSOLE_ENABLE   = no # Console for debug(+400)
 COMMAND_ENABLE   = yes # Commands for debug and configuration
 CUSTOM_MATRIX    = yes # Custom matrix file for the ErgoDox EZ
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE      = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 # MIDI_ENABLE    = yes 		# MIDI controls
-# uNICODE_ENABLE = yes 		# Unicode
+# UNICODE_ENABLE = yes 		# Unicode
 
 
 # Optimize size but this may cause error "relocation truncated to fit"
diff --git a/keyboard/ergodox_ez/README.md b/keyboard/ergodox_ez/README.md
index 8085e5cd87..51f1e2aa5a 100644
--- a/keyboard/ergodox_ez/README.md
+++ b/keyboard/ergodox_ez/README.md
@@ -15,8 +15,9 @@ This requires a little bit of familiarity with coding.
 
 1. Go to https://github.com/jackhumbert/qmk_firmware and read the Readme at the base of this repository, top to bottom. Then come back here :)
 2. Clone the repository (download it)
-3. Set up a build environment as per https://www.pjrc.com/teensy/gcc.html
-4. Copy `keymaps/keymap_default.c` into `keymaps/keymaps_your_name.c` (for example, `keymaps/keymap_german.c`)
+3. Set up a build environment as per [pjrc.com/teensy/gcc.html](https://www.pjrc.com/teensy/gcc.html)
+    - Using a Mac and have homebrew? just run `brew tap osx-cross/avr && brew install avr-libc`
+4. Copy `keymaps/keymap_default.c` into `keymaps/keymap_your_name.c` (for example, `keymaps/keymap_german.c`)
 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly.
 6. Compile your firmware by running `make clean` followed by `make KEYMAP=your_name`. Note that you must omit the `keymap_` prefix for your filename in this command -- for example, `make KEYMAP=german`. This will result in a hex file, which will always be called `ergodox_ez.hex`, regardless of your keymap name.
 6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above.
diff --git a/keyboard/ergodox_ez/ergodox_ez.c b/keyboard/ergodox_ez/ergodox_ez.c
index 78e956a042..d0eaf33923 100644
--- a/keyboard/ergodox_ez/ergodox_ez.c
+++ b/keyboard/ergodox_ez/ergodox_ez.c
@@ -6,12 +6,12 @@ uint8_t mcp23018_status = 0x20;
 
 __attribute__ ((weak))
 void * matrix_init_user(void) {
-
+    return NULL;
 };
 
 __attribute__ ((weak))
 void * matrix_scan_user(void) {
-
+    return NULL;
 };
 
 void * matrix_init_kb(void) {
@@ -34,16 +34,20 @@ void * matrix_init_kb(void) {
 
     ergodox_blink_all_leds();
 
-	if (matrix_init_user) {
-		(*matrix_init_user)();
-	}
+    if (matrix_init_user) {
+        (*matrix_init_user)();
+    }
+
+    return NULL;
 };
 
 void * matrix_scan_kb(void) {
 
-	if (matrix_scan_user) {
-		(*matrix_scan_user)();
-	}
+    if (matrix_scan_user) {
+        (*matrix_scan_user)();
+    }
+
+    return NULL;
 };
 
 
@@ -51,8 +55,19 @@ void ergodox_blink_all_leds(void)
 {
     ergodox_led_all_off();
     ergodox_led_all_set(LED_BRIGHTNESS_HI);
-    ergodox_led_all_on();
-    _delay_ms(333);
+    ergodox_right_led_1_on();
+    _delay_ms(50);
+    ergodox_right_led_2_on();
+    _delay_ms(50);
+    ergodox_right_led_3_on();
+    _delay_ms(50);
+    ergodox_right_led_1_off();
+    _delay_ms(50);
+    ergodox_right_led_2_off();
+    _delay_ms(50);
+    ergodox_right_led_3_off();
+    //ergodox_led_all_on();
+    //_delay_ms(333);
     ergodox_led_all_off();
 }
 
diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboard/ergodox_ez/ergodox_ez.h
index 3989a2f3ac..aceb7ed9c3 100644
--- a/keyboard/ergodox_ez/ergodox_ez.h
+++ b/keyboard/ergodox_ez/ergodox_ez.h
@@ -34,7 +34,7 @@ void ergodox_blink_all_leds(void);
 uint8_t init_mcp23018(void);
 uint8_t ergodox_left_leds_update(void);
 
-#define LED_BRIGHTNESS_LO       31
+#define LED_BRIGHTNESS_LO       15
 #define LED_BRIGHTNESS_HI       255
 
 
@@ -42,11 +42,13 @@ inline void ergodox_board_led_on(void)      { DDRD |=  (1<<6); PORTD |=  (1<<6);
 inline void ergodox_right_led_1_on(void)    { DDRB |=  (1<<5); PORTB |=  (1<<5); }
 inline void ergodox_right_led_2_on(void)    { DDRB |=  (1<<6); PORTB |=  (1<<6); }
 inline void ergodox_right_led_3_on(void)    { DDRB |=  (1<<7); PORTB |=  (1<<7); }
+inline void ergodox_right_led_on(uint8_t led) { DDRB |= (1<<(led+4)); PORTB |= (1<<(led+4)); }
 
 inline void ergodox_board_led_off(void)     { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
 inline void ergodox_right_led_1_off(void)   { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
 inline void ergodox_right_led_2_off(void)   { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
 inline void ergodox_right_led_3_off(void)   { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
+inline void ergodox_right_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); }
 
 inline void ergodox_led_all_on(void)
 {
@@ -67,6 +69,11 @@ inline void ergodox_led_all_off(void)
 inline void ergodox_right_led_1_set(uint8_t n)    { OCR1A = n; }
 inline void ergodox_right_led_2_set(uint8_t n)    { OCR1B = n; }
 inline void ergodox_right_led_3_set(uint8_t n)    { OCR1C = n; }
+inline void ergodox_right_led_set(uint8_t led, uint8_t n)  {
+    (led == 1) ? (OCR1A = n) :
+    (led == 2) ? (OCR1B = n) :
+                 (OCR1C = n);
+}
 
 inline void ergodox_led_all_set(uint8_t n)
 {
diff --git a/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.c b/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.c
new file mode 100644
index 0000000000..48f8c5d2ff
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.c
@@ -0,0 +1,187 @@
+// Netable differences vs. the default firmware for the ErgoDox EZ:
+// 1. The Cmd key is now on the right side, making Cmd+Space easier.
+// 2. The media keys work on OSX (But not on Windows).
+#include "ergodox_ez.h"
+#include "debug.h"
+#include "action_layer.h"
+
+#define BASE 0 // default layer
+#define SYMB 1 // symbols
+#define MDIA 2 // media keys
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  |  '"  |           |  '"  |   6  |   7  |   8  |   9  |   0  | BkSp   |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  | ~L1  |           | ~L1  |   Y  |   U  |   I  |   O  |   P  |   -    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|   /    |
+ * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1| Alt  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  |  L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Esc  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      |  (   |       |  {   |        |      |
+ *                                 | Space| LGui |------|       |------| RGui   |Enter |
+ *                                 |      |      |  )   |       |  }   |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[BASE] = KEYMAP(  // layer 0 : default
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_QUOT,
+        KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_FN1,
+        CTL_T(KC_ESC),  KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
+        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
+        LT(SYMB,KC_GRV),KC_LALT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
+                                              ALT_T(KC_APP),  KC_LGUI,
+                                                              KC_LPRN,
+                                               KC_SPC,KC_LGUI,KC_RPRN,
+        // right hand
+             KC_QUOT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSPC,
+             KC_FN1,      KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_MINS,
+                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),KC_BSLS,
+             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
+                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TG(1),
+             KC_ESC,        CTL_T(KC_ESC),
+             KC_LCBR,
+             KC_RCBR,KC_RGUI, KC_ENT
+    ),
+/* Keymap 1: Symbol Layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |------|       |------|      |      |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// SYMBOLS
+[SYMB] = KEYMAP(
+       // left hand
+       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
+       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
+       KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+                                       KC_TRNS,KC_TRNS,
+                                               KC_TRNS,
+                               KC_TRNS,KC_TRNS,KC_TRNS,
+       // right hand
+       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
+                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
+       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,
+                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS
+),
+/* Keymap 2: Media and mouse keys
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |  Play  |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        |      |      |       |      |      |
+ *                                 ,------|------|------|       |------+------+------.
+ *                                 |      |      |      |       |      |      |Brwser|
+ *                                 |      |      |------|       |------|      |Back  |
+ *                                 |      |      |      |       |      |      |      |
+ *                                 `--------------------'       `--------------------'
+ */
+// MEDIA AND MOUSE
+KEYMAP(
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+                                           KC_TRNS, KC_TRNS,
+                                                    KC_TRNS,
+                                  KC_TRNS, KC_TRNS, KC_TRNS,
+    // right hand
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
+                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_TRNS,
+       KC_TRNS,
+       KC_TRNS, KC_TRNS, KC_WBAK
+),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB)                // FN1 - Momentary Layer 1 (Symbols)
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  // MACRODOWN only works in this function
+      switch(id) {
+        case 0:
+        if (record->event.pressed) {
+          register_code(KC_RSFT);
+        } else {
+          unregister_code(KC_RSFT);
+        }
+        break;
+      }
+    return MACRO_NONE;
+};
+
+// Runs just one time when the keyboard initializes.
+void * matrix_init_user(void) {
+
+};
+
+// Runs constantly in the background, in a loop.
+void * matrix_scan_user(void) {
+
+    uint8_t layer = biton32(layer_state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+    switch (layer) {
+      // TODO: Make this relevant to the ErgoDox EZ.
+        case 1:
+            ergodox_right_led_1_on();
+            break;
+        case 2:
+            ergodox_right_led_2_on();
+            break;
+        default:
+            // none
+            break;
+    }
+
+};
diff --git a/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.hex b/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.hex
new file mode 100644
index 0000000000..e3ee9afd3e
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/keymap_andrew_osx.hex
@@ -0,0 +1,1471 @@
+:100000000C9400070C9444070C9444070C94440788

+:100010000C9444070C9444070C9444070C94440734

+:100020000C9444070C9444070C9458120C942A1313

+:100030000C9444070C9444070C9444070C94440714

+:100040000C9444070C94022C0C9444070C94440721

+:100050000C9444070C94FA210C9444070C94440724

+:100060000C9444070C9444070C9444070C944407E4

+:100070000C9444070C9444070C9444070C944407D4

+:100080000C9444070C9444070C9444070C944407C4

+:100090000C9444070C9444070C9444070C944407B4

+:1000A0000C9444070C9444070C9444079713B91319

+:1000B000A714B913A714FE132114A71476148914D6

+:1000C000D017D017FF17FF17431881189B1A9B1AD8

+:1000D0009A189B1A9B199B196F1A9B1A9B1A861ABE

+:1000E0000000F0A12E002B002971E10035810000F5

+:1000F0001E00140004001D71E20027021F001A00F8

+:1001000016001B00E104E3002000080007000600C1

+:1001100050002C0021001500090019004F00260294

+:10012000220017000A000500000065743400C100B9

+:100130000000007F0000E3003400C10000000077F1

+:100140000000290023001C000B0011000000297191

+:10015000240018000D00100052002F0225000C0092

+:100160000E00360051002800260012000F00370054

+:100170002F00E7002700130033823871300030026F

+:100180002A002D003100E5000154000001000100AB

+:1001900001000100010000003A001E0220022202BC

+:1001A000010001003B001F022102230201000100A7

+:1001B0003C002F0226022F00010001003D0030020A

+:1001C00027023000010001003E00310235003502F7

+:1001D000000001000100010000000100000001001A

+:1001E0000100010000000100000001003F0052007A

+:1001F00051002402000001004000240021001E00E4

+:10020000010001004100250022001F00370001000D

+:1002100042002600230020002700010043002502A1

+:100220002E0231002E0001004400450001000100B3

+:1002300001000000010001000100010001000000B8

+:1002400001000100010001000100010001000100A6

+:10025000F2000100010001000100F000F1000100C6

+:10026000F400010001000100F3000100F5000100AD

+:100270000100010001000100000001000100010077

+:100280000000010000000100010001000000010069

+:100290000000010001000100010001000000010058

+:1002A0000100010001000100A9000100010001009E

+:1002B0000100AC00AA00B600010001000100AB0083

+:1002C000A80001000100010001000100010001007F

+:1002D00001000100AE000100010000000A0025300D

+:1002E000313662003A200025303258000A722F63FE

+:1002F0002030313233343536373839414243444582

+:10030000460A000A002530325800626F756E636538

+:10031000213A20006C6566742073696465206174FD

+:100320007461636865640A006C656674207369644F

+:1003300065206E6F7420726573706F6E64696E678E

+:100340000A00747279696E6720746F207265736534

+:1003500074206D637032333031380A000A444542EC

+:1003600055473A20656E61626C65642E0A005B73C6

+:100370005D004B6579626F617264207374617274A1

+:100380002E0A005B575D005B535D005B525D005BB6

+:10039000445D005B435D0016034500720067006F1B

+:1003A0000044006F007800200045005A000000164D

+:1003B000034500720067006F0044006F0078002062

+:1003C0000045005A0000000403090409028D0005DD

+:1003D0000100A0FA09040000010301010009211134

+:1003E000010001223F000705810308000A090401FA

+:1003F000000103010200092111010001224D000743

+:1004000005820308000A0904020001030000000934

+:1004100021110100012236000705830308000A09A3

+:100420000403000203000000092111010001222041

+:1004300000070584032000010705040320000109CB

+:100440000404000103000000092111010001223908

+:1004500000070585031000011201100100000008CB

+:10046000EDFE071301000102000105010906A101CB

+:10047000050719E029E71500250195087501810296

+:100480000508190129059505750191029501750366

+:100490009101050719002977150025019578750147

+:1004A0008102C00631FF0974A1010975150025FFFD

+:1004B0009520750881020976150025FF952075089D

+:1004C0009102C005010980A101850216010026B72D

+:1004D000001A01002AB700751095018100C0050CB3

+:1004E0000901A1018503160100269C021A01002AB8

+:1004F0009C02751095018100C005010902A1010946

+:1005000001A10005091901290515002501950575A9

+:100510000181029501750381010501093009311539

+:1005200081257F95027508810609381581257F95FB

+:100530000175088106050C0A38021581257F950191

+:1005400075088106C0C005010906A101050719E06B

+:1005500029E71500250195087501810295017508A7

+:10056000810105081901290595057501910295017B

+:10057000750391010507190029FF150025FF950650

+:1005800075088100C00A002530325820006B65795B

+:10059000626F6172645F7265706F72743A20000AF4

+:1005A0000025303258006B6579626F6172645F7349

+:1005B00065745F6C65643A200064656C5F6B657997

+:1005C0005F6269743A2063616E27742064656C3AD7

+:1005D00020253032580A006164645F6B65795F6280

+:1005E00069743A2063616E2774206164643A20253F

+:1005F0003032580A00646F6E652E0A00626F6F67B2

+:100600006D61676963207363616E3A202E2E2E2020

+:1006100000290A002575002F002575005D2800259A

+:10062000640020002564002000256400200025646B

+:10063000007C0025303258006D6F7573656B6579ED

+:10064000205B62746E7C782079207620685D287249

+:1006500065702F61636C293A205B006D6B5F776872

+:1006600065656C5F74696D655F746F5F6D6178203F

+:100670003D2025640A006D6B5F776865656C5F6D72

+:1006800061785F7370656564203D2025640A006DA4

+:100690006B5F74696D655F746F5F6D6178203D207D

+:1006A00025640A006D6B5F6D61785F7370656564CA

+:1006B000203D2025640A006D6B5F696E746572765B

+:1006C000616C203D2025640A006D6B5F64656C6180

+:1006D00079203D2025640A006D6B5F776865656C45

+:1006E0005F74696D655F746F5F6D6178203D202573

+:1006F000640A006D6B5F776865656C5F6D61785F3C

+:100700007370656564203D2025640A006D6B5F741D

+:10071000696D655F746F5F6D6178203D2025640AA7

+:10072000006D6B5F6D61785F7370656564203D205F

+:1007300025640A006D6B5F696E74657276616C206A

+:100740003D2025640A006D6B5F64656C6179203D16

+:100750002025640A000A00257500363A207768656E

+:10076000656C5F74696D655F746F5F6D61783A2069

+:10077000000A00257500353A20776865656C5F6D65

+:1007800061785F73706565643A20000A0025750022

+:10079000343A2074696D655F746F5F6D61783A20DB

+:1007A000000A00257500333A206D61785F7370652B

+:1007B00065643A20000A00257500323A20696E749B

+:1007C000657276616C286D73293A20000A002575E0

+:1007D00000313A2064656C6179282A31306D7329C3

+:1007E0003A20000A092D2056616C756573202D0A88

+:1007F000004D3E004D25643E20003F00736574208F

+:1008000064656661756C740A00433E200077686514

+:1008100072652064656C74613A20637572736F72DF

+:100820003D25642C20776865656C3D25640A536519

+:100830006520687474703A2F2F656E2E77696B6926

+:1008400070656469612E6F72672F77696B692F4DD0

+:100850006F7573655F6B6579730A000A092D204D0A

+:100860006F7573656B6579202D0A4553432F713A77

+:1008700009717569740A313A0964656C6179282ACD

+:1008800031306D73290A323A09696E746572766186

+:100890006C286D73290A333A096D61785F7370654E

+:1008A00065640A343A0974696D655F746F5F6D61E0

+:1008B000780A353A09776865656C5F6D61785F73B2

+:1008C000706565640A363A09776865656C5F7469B6

+:1008D0006D655F746F5F6D61780A0A703A097072B6

+:1008E000696E742076616C7565730A643A09736584

+:1008F000742064656661756C74730A75703A092BAF

+:10090000310A646F776E3A092D310A706775703A53

+:10091000092B31300A7067646F776E3A092D3130D8

+:100920000A0A7370656564203D2064656C746120FB

+:100930002A206D61785F7370656564202A202872B3

+:100940006570656174202F2074696D655F746F5FD9

+:100950006D6178290A003F004D3E2000433E200093

+:100960004C25640A000A092D20436F6E736F6C6575

+:10097000202D0A4553432F713A09717569740A6D28

+:100980003A096D6F7573656B65790A000A092D2048

+:100990004D61676963202D0A643A09646562756771

+:1009A0000A783A096465627567206D6174726978C6

+:1009B0000A6B3A096465627567206B6579626F61DD

+:1009C00072640A6D3A096465627567206D6F7573AC

+:1009D000650A763A0976657273696F6E0A733A0929

+:1009E0007374617475730A633A09636F6E736F6C25

+:1009F00065206D6F64650A302D343A096C61796544

+:100A000072302D34284631302D4634290A50617514

+:100A1000733A09626F6F746C6F616465720A653A4C

+:100A200009656570726F6D0A6E3A094E4B524F0A36

+:100A30007A3A09736C656570204C4544207465737F

+:100A4000740A000A002575002E6E6B726F3A200042

+:100A50000A002575002E737761705F6261636B73A6

+:100A60006C6173685F6261636B73706163653A2088

+:100A7000000A002575002E737761705F67726176DA

+:100A8000655F6573633A20000A002575002E6E6F5E

+:100A90005F6775693A20000A002575002E7377613B

+:100AA000705F72616C745F726775693A20000A004A

+:100AB0002575002E737761705F6C616C745F6C6775

+:100AC00075693A20000A002575002E636170736C09

+:100AD0006F636B5F746F5F636F6E74726F6C3A20DD

+:100AE000000A002575002E737761705F636F6E7466

+:100AF000726F6C5F636170736C6F636B3A20000A96

+:100B00000025303258006B65796D61705F636F6EE0

+:100B10006669672E7261773A20000A002575002EFB

+:100B20006D6F7573653A20000A002575002E6B65A0

+:100B300079626F6172643A20000A002575002E6D9B

+:100B400061747269783A20000A002575002E656E7E

+:100B500061626C653A20000A0025303258006465F5

+:100B60006275675F636F6E6669672E7261773A20A0

+:100B7000000A0025750064656661756C745F6C61C0

+:100B80007965723A20003F004E4B524F3A206F6613

+:100B9000660A004E4B524F3A206F6E0A0074696D20

+:100BA00065725F636F756E743A202530346C580A35

+:100BB000006B6579626F6172645F6E6B726F3A2071

+:100BC00025580A006B6579626F6172645F69646CB5

+:100BD000653A2025580A006B6579626F6172645F1F

+:100BE00070726F746F636F6C3A2025580A00686FDB

+:100BF00073745F6B6579626F6172645F6C65647357

+:100C000028293A2025580A000A092D2053746174B6

+:100C10007573202D0A004743433A20342E392E3372

+:100C2000204156522D4C4942433A20312E382E3124

+:100C3000204156525F415243483A20617672350A4C

+:100C4000004F5054494F4E533A204C554641204294

+:100C50004F4F544D41474943204D4F5553454B4508

+:100C6000592045585452414B455920434F4E534FFC

+:100C70004C4520434F4D4D414E44204E4B524F204A

+:100C80003531320A004255494C443A2030663263CD

+:100C9000373733202831313A30393A3531204A61FB

+:100CA0006E2020352032303136290A005649443A28

+:100CB00020307846454544284572676F446F782058

+:100CC000455A29205049443A20307831333037286A

+:100CD0004572676F446F7820455A29205645523A2D

+:100CE000203078303030310A00444553433A207484

+:100CF0002E6D2E6B2E206B6579626F61726420669B

+:100D000069726D7761726520666F72204572676FD8

+:100D1000646F780A000A092D2056657273696F6E38

+:100D2000202D0A000A6D6F7573653A206F66660A9A

+:100D3000000A6D6F7573653A206F6E0A000A6B6565

+:100D400079626F6172643A206F66660A000A6B65A9

+:100D500079626F6172643A206F6E0A000A6D617485

+:100D60007269783A206F66660A000A6D617472696A

+:100D7000783A206F6E0A000A64656275673A206FE0

+:100D80006E0A000A64656275673A206F66660A003B

+:100D90000A0A626F6F746C6F616465722E2E2E206A

+:100DA00000433E20006565636F6E6669673A0A001E

+:100DB000536C656570204C454420746573740A005B

+:100DC0000000000000000000000000010204060A0C

+:100DD0000F17202C3A4A5D71879DB3C7DAE9F5FCFD

+:100DE000FFFCF5E9DAC7B39D87715D4A3A2C2017FD

+:100DF0000F0A0604020100000000000000000000CD

+:100E000011241FBECFEFDAE0DEBFCDBF04B603FE74

+:100E100024C08091F9019091FA01A091FB01B09159

+:100E2000FC018730904BA740B04BB9F41092F90108

+:100E30001092FA011092FB011092FC0114BE84B7CB

+:100E4000877F84BF88E10FB6F8948093600010928A

+:100E500060000FBEE0E0FFE3099511E0A0E0B1E023

+:100E6000E0EAFBE502C005900D92AA33B107D9F77D

+:100E700011E0AAE3B1E001C01D92A93FB107E1F77B

+:100E80000E94900F0C94CE2D0C940000FF93EF93D2

+:100E9000E0913A01F0913B01309709F00995EF910B

+:100EA000FF910895FC018591803011F0EFDFFBCFB9

+:100EB0000895FF27E0E230E247FF0CC0419597FF1D

+:100EC00009C0EDE26095709580959095611D711D4A

+:100ED000811D911D27FF02C0219530E350E2AA2712

+:100EE000660F771F881F991FAA1FA41710F0A41B55

+:100EF00063955A95A9F7AA3008F0A95FA05DAF9352

+:100F0000F395611571058105910541F7ED3211F4F5

+:100F1000EF93F395F21718F43F93F395FBCF8F916E

+:100F2000B5DFFA95E1F70895E991F991859180305F

+:100F300021F0853219F0AADFF9CF089520E0E89476

+:100F400055915532C1F3503311F4689455915A3389

+:100F500048F4505390F3220F022E220F220F200D3F

+:100F6000250FF4CF0EF4219589919991533619F3F9

+:100F7000533729F1533559F1BC0188279927E89453

+:100F80005C3621F48991999168945591543639F4DD

+:100F900046EF7EF077FF0DC08FEF9FEF0AC0553709

+:100FA0004AE039F0583540E121F0523642E009F08C

+:100FB0000895FF93EF937DDFEF91FF91B7CFFF93FC

+:100FC000EF93FC0181918030B9F360DFFBCFFF9399

+:100FD000EF9368DFF1CFDF93CF93CDB7DEB72596E0

+:100FE000A3DFCF91DF91089561110BC0FC018281D5

+:100FF000882321F085EE0E946D1603C085EE0E94C5

+:10100000351780E090E0089508956091BC017091DB

+:10101000BD018091BE019091BF010E94FD205698B4

+:101020005E9825982D9826982E9827982F9881308D

+:1010300019F0823021F00895259A2D9A0895269A64

+:101040002E9A089585E098E0892B11F00E940508FA

+:1010500080E090E0089556985E9825982D982698FF

+:101060002E9827982F988FEF90E090938900809387

+:10107000880090938B0080938A0090938D008093DA

+:101080008C00259A2D9A2FEF80E792E02150804026