The master copy is working. Renamed subview for Prototype cell and for subviews properties
Merge branch 'master' of github.com:iamjohnandrews/Guilt
arranged images and descriptionscorrectly. Added subview class for product prototype cell and added label properties
Parse SDK
Merge pull request #6 from DrCiencia78/user-profiles-parse

Parse SDK
added code in ImagesVC that connects product info to scene
trying to test Scanner Code and added code to ScannerVC
Merge remote-tracking branch 'origin/master'

Conflicts:
	Guilt.xcodeproj/project.pbxproj
	Guilt/Base.lproj/Main.storyboard
Parse login
created protocol and chaged name of scanner delegate to delegate. Need to add UIALertView method to ConversionVC and call the delegate in ScannerVC
merge
merge
updated login
Merge pull request #9 from DrCiencia78/data-model

updated login
added delegate to ConversionVC and made ScannerVC the delegating object. IDK how to test if it works. Scanner just NSLogs UPS indefinetly
added an instruction comment for JA in scannerVC
edited calculate conversion method to take NSNumber parameter. Added method to delegate for when product info is returned
testing if product info passes through to conversionVC, so far it does not
added progress activity spinner to storyboard. added performSegue method for when product info is returned
I'm lost trying to get delegate to work