Added beginning combat.

Layout is finished for the most part, combat is being added in. Larger
map with much more options and a sense of expansiveness.