Update Complete!
done
Merge branch 'Messageing-Protocol' of https://github.com/Dustinschie/Tracking into Messageing-Protocol

Conflicts:
	.DS_Store
Done