Added main screen, support for different screens
Added interaction with NPCs

An NPC will turn green and fade away if you press A next to it
I went crazy with my Eclipse formatter...

I like curly braces on the next line
Made a RandomWalkAI class and a World class

Also, I moved collision detection to the Map class
Merged Attack stuff with Master to reduce errors

Merged now instead of when done to reduce differences accumulating.  It
worked pretty well.

Had to change how map stuff was called.  It should not be static, since
we may have multiple maps at the same time.

Changed Attack buttons to J and K.  J for attacking, K for switching if
you are using melee.  You can test melee out if you uncomment the line
in the World init.