config file
Merge remote-tracking branch 'origin/resizing' into resizing

Conflicts:
	.idea/workspace.xml
lives working