doc ...
Merge branch 'master' of https://github.com/UbiquitousComputingSS14/Documentation

Conflicts:
	HeartRateMonitor.pdf
doc ...