무서워
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/GalleryActivity$VideoGalleryAdapter.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/GalleryActivity$VideoViewInfo.class
	OurBlackBox5/bin/classes/com/example/ourblackbox2/GalleryActivity.class
	OurBlackBox5/bin/resources.ap_