modified:   AndroidManifest.xml
	modified:   bin/AndroidManifest.xml
	modified:   bin/DroidControl.apk
	modified:   bin/classes.dex
	modified:   bin/classes/com/example/droidcontrol/BluetoothControllerActivity.class
	modified:   bin/classes/com/example/droidcontrol/MainActivity.class
	modified:   bin/resources.ap_
	modified:   project.properties
	modified:   res/layout/activity_main.xml
	modified:   res/layout/scan_results.xml
	modified:   src/com/example/droidcontrol/BluetoothControllerActivity.java
	modified:   src/com/example/droidcontrol/MainActivity.java

	modified:   AndroidManifest.xml
	modified:   bin/AndroidManifest.xml
	modified:   bin/DroidControl.apk
	modified:   bin/classes.dex
	modified:   bin/classes/com/example/droidcontrol/BluetoothControllerActivity.class
	modified:   bin/classes/com/example/droidcontrol/MainActivity.class
	modified:   bin/resources.ap_
	modified:   project.properties
	modified:   res/layout/activity_main.xml
	modified:   res/layout/scan_results.xml
	modified:   src/com/example/droidcontrol/BluetoothControllerActivity.java
	modified:   src/com/example/droidcontrol/MainActivity.java
	.idea/
	DroidControl.iml
	bin/R.txt
Merge branch 'master' of git://github.com/Valdyan/DroidControl