More code
Merge branch 'master' of https://github.com/andresteves/riChallenge

Conflicts:
	riChallenge/GetData.m
	riChallenge/RibotarViewController.m