test2
Merge branch 'master' of https://github.com/Geliozzz/sensor_test

Conflicts:
	app/src/main/java/ru/oxbao/sensor_test/Collector.java
	app/src/main/java/ru/oxbao/sensor_test/InputInterface.java
	app/src/main/java/ru/oxbao/sensor_test/Saver.java
	app/src/main/java/ru/oxbao/sensor_test/SensorInput.java
	app/src/main/java/ru/oxbao/sensor_test/TestExecutor.java
1