Merge remote-tracking branch 'origin/master'

Conflicts:
	Feuds/test_Data/output_log.txt