Map.java ->Victory and draw check
Merge origin/master