Merge pull request #4 from AdorableMallow/master

Fixed all that needed fixings :(
Update sh_Adb_001.lua
Fix conflict.