Merge origin/master

Conflicts:
	src/BYUI/cit260/DuchessOfDamascus/control/ProgramControl.java
	src/BYUI/cit260/DuchessOfDamascus/view/StartProgramView.java