Some changes
Some changes
Merge branch 'master' of https://github.com/vgrdominik/Panera

Conflicts:
	.idea/workspace.xml