fixed error on add for guest and budget
fixed error on add for guest and budget
Delete merge conflict code
Merge pull request #88 from jloehman/jason

fixed error on add for guest and budget