Fied conflict with location class
Fied conflict with location class
Merge origin/master

Conflicts:
	src/BYUI/cit260/DuchessOfDamascus/view/ViewInterface.java
Merge origin/master

Conflicts:
	src/BYUI/cit260/DuchessOfDamascus/view/ViewInterface.java