Adds constants for tile width and height
resolve merge conflicts
Resolve merge conflicts
Uses tile constants in main for width and height.
Fog of War at start working