Add map class
Merge origin/master

Conflicts:
	ProjectD/src/ProjectX.java