FINAL
Merge remote-tracking branch 'origin/master'

Conflicts:
	final_code/DietertSykesKirchofer.txt