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

Conflicts:
	OurBlackBox5/bin/classes/com/example/ourblackbox2/GalleryActivity.class
	OurBlackBox5/bin/jarlist.cache
	OurBlackBox5/project.properties