ignore idea/workspace.xml
Merge branch 'master' of github.com:asnir/OnMyWay

Conflicts:
	.idea/workspace.xml