css, układ
idea
Merge branch 'master' of https://github.com/mszkodzinski/19115

Conflicts:
	.idea/workspace.xml
css, układ
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml