included andre's changes
Merge remote-tracking branch 'origin/master'
script tweaks, image tweaks
inventory system + edits to dialogue script
merge conflicts resolved...?
big changes to unit scripts