got Quicksand Font to work, thank you Max
created notification of when keyboard appears for view to move up
added new scanner button and changed font to Quicksand
moved outlets on the ConversionVC north
Joe Crall layout suggestions
Merge branch 'master' of https://github.com/iamjohnandrews/Guilt into data-parse10

Conflicts:
	Guilt/Base.lproj/Main.storyboard