adding new assets
adding conversation data
Merge branch 'master' of https://github.com/josefnpat/bacongamejam-07