Removal of <<<<<HEAD issues and original changes to bluetooth in C++ before abandoning attempts
Merge branch 'master' of https://github.com/no1mzb/METR4810

Conflicts:
	src/bluetooth.cpp
	src/jonohax.h