resolve merge

Readme.md

...se_lib/keysight/uploader_core/uploader.cp36-win_amd64.pyd

...uploader_core/keysight_awg_post_processing_and_upload.obj

...3.6/Release/pulse_lib/keysight/uploader_core/mem_ctrl.obj

...3.6/Release/pulse_lib/keysight/uploader_core/uploader.obj

examples/__pycache__/example_init.cpython-36.pyc

examples/__pycache__/loading_HVI_code.cpython-36.pyc

examples/__pycache__/loading_HVI_code_fast.cpython-36.pyc

examples/example_init.py

examples/loading_HVI_code.py

examples/loading_HVI_code_fast.py

examples/nagaoka_example.py

nagaoka_example.py

pulse_lib.egg-info/SOURCES.txt

pulse_lib/__pycache__/base_pulse.cpython-36.pyc

pulse_lib/__pycache__/sequencer.cpython-36.pyc

pulse_lib/keysight/__pycache__/uploader.cpython-36.pyc

pulse_lib/keysight/uploader.py

...uploader_core/keysight_awg_post_processing_and_upload.cpp

...t/uploader_core/keysight_awg_post_processing_and_upload.h