commit
Conflicts:
	.idea/workspace.xml
eliminatad
my last modified