File change

Added extra map class to be filled up
Merge branch 'master' of https://github.com/Snazzythat/Team11_Code_2014

Conflicts:
	src/Navigation.java