Threading for faster loading
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/App.java
Added the scenario to the challenges section
Added the scenario to the challenges section