пул семплов и еще что-то
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arduino2AndroidTest/ard2and/src/main/java/com/example/ard2and/MainActivity2.java
	Arduino2AndroidTest/ard2and/src/main/res/raw/fld_hatcl_04.wav
	Arduino2AndroidTest/ard2and/src/main/res/raw/fls_kick1.mp3
	Arduino2AndroidTest/ard2and/src/main/res/raw/fls_snare1.mp3
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Arduino2AndroidTest/ard2and/src/main/java/com/example/ard2and/MainActivity2.java
	Arduino2AndroidTest/ard2and/src/main/res/raw/fld_hatcl_04.wav
	Arduino2AndroidTest/ard2and/src/main/res/raw/fls_kick1.mp3
	Arduino2AndroidTest/ard2and/src/main/res/raw/fls_snare1.mp3