merging to get database
Merge branch 'development' of https://github.com/sunheng/TeamJavatar.git
into development

Conflicts:
	bin/classes/com/example/teamjavatar/R$id.class
	bin/classes/com/example/teamjavatar/R$layout.class
	bin/classes/com/example/teamjavatar/R$menu.class
	bin/classes/com/example/teamjavatar/R$string.class
	bin/classes/com/example/teamjavatar/R$style.class
	gen/com/example/teamjavatar/R.java
Merge branch 'development' of https://github.com/sunheng/TeamJavatar.git
into development

Conflicts:
	bin/classes/com/example/teamjavatar/R$id.class
	bin/classes/com/example/teamjavatar/R$layout.class
	bin/classes/com/example/teamjavatar/R$menu.class
	bin/classes/com/example/teamjavatar/R$string.class
	bin/classes/com/example/teamjavatar/R$style.class
	gen/com/example/teamjavatar/R.java
i just want to merge
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	bin/classes/com/example/teamjavatar/R$id.class
	bin/classes/com/example/teamjavatar/R$layout.class
	bin/classes/com/example/teamjavatar/R$menu.class
	bin/classes/com/example/teamjavatar/R$string.class
	bin/classes/com/example/teamjavatar/R$style.class
	gen/com/example/teamjavatar/R.java
	res/values/strings.xml