제발
Merge branch 'master' of https://github.com/haniemF5/haniem_F5.git

Conflicts:
	OurBlackBox5/bin/OurBlackBox5.apk
	OurBlackBox5/bin/classes.dex
	OurBlackBox5/bin/classes/com/example/ourblackbox2/BIOstream.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/BRecorder.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/BThreadRecorder$1.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/BThreadRecorder.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/SettingActivity.class
	OurBlackBox5/bin/resources.ap_
	OurBlackBox5/project.properties
	OurBlackBox5/src/com/example/ourblackbox2/BIOstream.java
	OurBlackBox5/src/com/example/ourblackbox2/BRecorder.java
	OurBlackBox5/src/com/example/ourblackbox2/BThreadRecorder.java
	OurBlackBox5/src/com/example/ourblackbox2/SettingActivity.java