add parse
Merge branch 'master' of github.com:iamjohnandrews/Guilt
Merge branch 'master' of github.com:iamjohnandrews/Guilt
Merge branch 'master' of github.com:iamjohnandrews/Guilt into guiltBranch
got intro to work
dylans merged conflicts resolved