merging my dialogue system with boomer's enemy attact system
Merged fixed files: Assets/Atlas