adf
Merge branch 'master' of https://github.com/vrcaciuc/MyApplication2

Conflicts:
	.idea/.name
	.idea/misc.xml
	.idea/workspace.xml