Added logical resolve conflict for traps, assassin, and important thing.
Basic moving should also work now.
MERGEMerge branch 'master' of https://github.com/keithkade/Fantegio