Updates
Update
Merge branch 'master' of ssh://github.com/dgilbert79/BatteryDiag

Conflicts:
	.gitignore
	src/com/example/batterydiag/MainLoop.java

	modified:   src/com/example/batterydiag/MainLoop.java