Merge remote-tracking branch 'origin/master' into Josh-Fix
Merge remote-tracking branch 'origin/master' into Josh-Fix
Unit Display now shows depletion of resources
Merge remote-tracking branch 'origin/Josh-Fix'
Units can move
Map update

Made an important update to Map and Point
Merge branch 'master' of https://github.com/kawake/WarGame
Finished Map Generator Integration

WOOOOO