first
second
Merge branch 'master' of github.com:shj00007/android

Conflicts:
	.gitignore
fix2