.gitignore

<<<<<<< HEAD
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
=======
/closedLoopAlgorithm.py
/Participant_0_BR.txt
/Participant_0_HR.txt
/Participant_274_BR.txt
/Participant_274_HR.txt
/Participant_276_BR.txt
/Participant_276_HR.txt
/Participant_277_BR.txt
/Participant_277_HR.txt
/Participant_278_BR.txt
/Participant_278_HR.txt
/Participant_279_BR.txt
/Participant_279_HR.txt
/Participant_280_BR.txt
/Participant_280_HR.txt
/Participant_281_BR.txt
/Participant_281_HR.txt
/Participant_282_BR.txt
/Participant_282_HR.txt
/Participant_350_BR.txt
/Participant_350_HR.txt
/sensor.py
*.pyc
*.pyo
>>>>>>> websocket/master