com2
Merge branch 'nowa'