test commit
updated Scanner & Conversion Controllers
updated scanner error handling.
Merge branch 'scanner' of https://github.com/DrCiencia78/Guilt into DrCiencia78-scanner

Conflicts:
	Guilt/ConversionViewController.m