Refactored Character and object
Refactored Map and MapViewer
Resolving merge conflicts
Resolving further conflicts