Merge branch 'master' of https://github.com/mszkodzinski/19115

Conflicts:
	.idea/workspace.xml
	public/css/style.css
x
d