Added welcome text
Merge branch 'master' of https://github.com/sunheng/TeamJavatar
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml