Merge pull request #4 from SufferMyJoy/alex

Refixed the bug Evan fixed when entering Bottom Entrance or Right
Added TODO items for the other programmers.