update2
Merge branch 'master' of github.com:Ricozhet/CAMEROOM

Conflicts:
	aaa.txt