Sth
Merge remote-tracking branch 'origin/master'

Conflicts:
	2/bridges/Project2.exe