왜죠
Merge branch 'master' of https://github.com/haniemF5/haniem_F5.git

Conflicts:
	OurBlackBox5/bin/OurBlackBox5.apk
	OurBlackBox5/bin/R.txt
	OurBlackBox5/bin/classes.dex
	OurBlackBox5/bin/resources.ap_
	OurBlackBox5/gen/com/example/ourblackbox2/R.java