1 lab
2 lab
Merge branch 'master' of github.com:AlexxxShib/Android-my-examples

Conflicts:
	Note2/.idea/workspace.xml