merge
merge
Merge branch 'master' of https://github.com/neerajthakur11/DisKonnect
milestone 1
Merge branch 'master' of https://github.com/neerajthakur11/DisKonnect
milestone 2
file removed
Merge branch 'master' of https://github.com/neerajthakur11/DisKonnect
done with codeing
Merge branch 'master' of https://github.com/neerajthakur11/DisKonnect

Conflicts:
	code/AndroidManifest.xml