Began working on a dummy version of map class
Map class now reads from a file and generates a map
Quick bug fix

Forgot scanner.close
Merge remote-tracking branch 'origin/master' into Alex