.
Merge branch 'master' of github.com:maxenko/pindap

Conflicts:
	.idea/workspace.xml