paths working
Merge branch 'master' into feature/jstricker/moveCommandsAndBlocks

Conflicts:
	CareHuds/CareHuds/CareHuds/ViewController.m
Merge pull request #13 from jatraiz/feature/jstricker/moveCommandsAndBlocks

paths working