Merge origin/master

Conflicts:
	.gitignore
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/byui/cit260/LostOnAnIsland/control/ChallengeControl.java
	src/byui/cit260/LostOnAnIsland/objectModeling/Challenge.java
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml