task 4
Merge branch 'master' of https://github.com/bumeshrai/androidApp

Conflicts:
	myListBasic/bin/classes.dex
	myListBasic/bin/myListBasic.apk

task 4