Catching up with git
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/info/billebeling/sensor401/app/MainActivity.java