Trap Fixed (maybe)
Merge branch 'master' of https://github.com/DavidFarrell/CaptainBlood