merge
updating class files
Update .gitignore
Added welcome text
merge
Merge branch 'master' of https://github.com/sunheng/TeamJavatar.git
Merge branch 'master' of https://github.com/sunheng/TeamJavatar
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml
Fixed Welcome Strings
Updated Strings
Removed Error Causing Code
Fixed invalid string names,
plus alphabetical order now
fixed strings.xml