.
Merge branch 'master' of
ssh://git@github.com/gamaprime/KatilKimAndroid.git

Conflicts:
	AndroidManifest.xml