??..
Create .gitignore
gitignore Accept
Recovery gitignore file
gitignoreTest
Update .gitignore
삭제

이거 겹치면 개발할때 에러뜸
gitignore test2
Merge branch 'hagi4u' into develop
Merge branch 'choigoon' of https://github.com/Family-of-loves/Android into choigoon

Conflicts:
	bin/R.txt
	bin/classes/com/example/wearetherunningman/Array.class
	bin/classes/com/example/wearetherunningman/MainActivity$1.class
	bin/classes/com/example/wearetherunningman/MainActivity$2.class
	bin/classes/com/example/wearetherunningman/MainActivity$3.class
	bin/classes/com/example/wearetherunningman/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/wearetherunningman/MainActivity.class
	bin/classes/com/example/wearetherunningman/R$id.class
	bin/classes/com/example/wearetherunningman/R$integer.class
	bin/classes/com/example/wearetherunningman/R$layout.class
	bin/classes/com/example/wearetherunningman/R$menu.class
	bin/classes/com/example/wearetherunningman/R$string.class
	bin/classes/com/example/wearetherunningman/R$style.class
	bin/classes/com/example/wearetherunningman/R$styleable.class
	bin/classes/com/example/wearetherunningman/WsCallback.class
	gen/com/example/wearetherunningman/R.java
Merge branch 'develop' into choigoon

Conflicts: