mock baby service
sitter mock baby application
Merge branch 'master' of https://github.com/azsuth/Sitter-Android

Conflicts:
	SitterBLE/project.properties
BluetoothProximityService
Merge branch 'master' of https://github.com/dannycohn/Sitter-Android

Conflicts:
	Sitter/AndroidManifest.xml
	Sitter/res/layout/activity_main.xml

committing
hooked up the proximity service
Merge pull request #4 from azsuth/master

mock baby service
Toasts