Stuff happened
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/medinf/medinfsignals/SensorPlot.java