Training
Merge remote-tracking branch 'origin/master'

Conflicts:
	CaptureTheFlag/dynamicscripting/catcher.txt
	CaptureTheFlag/knowledge.py