changed mock data and adding MapPlot.java to github for the first time
adding test folder to classpath
done merging..?
merging complete......????
BLAH MERGING