settings!
Merge branch 'master' of https://github.com/rascheel/Cpre388Lab10

Conflicts:
	src/com/example/btheartrate/HeartMonitor.java