Updating to the most recent code.
Merge branch 'master' of https://github.com/TANguyen1893/DPMGroup3

Conflicts:
	Navigation.java