Merge branch 'doug'
update
update
uncommitted changes error fix?"
Merge branch 'ian'
additional modifications
…
added the form to place wishes, constants file…
wishes are being added on Parse