Current working committed version, some minor changes. Still working on full overhaul of trading event and adding more events
Merge branch 'master' of http://github.com/Toast3y/Trials-of-the-Dolphin-King
Added more comments, marked which pages I had involvement in