Generated by the compiler,no more needed
Merge branch 'master' of https://github.com/infocorenj/Traffic

Conflicts:
	bin/AndroidManifest.xml
	bin/Traffic.apk
	bin/classes.dex
	bin/classes/com/example/traffic/MainActivity$4.class
	bin/classes/com/example/traffic/MainActivity.class
	bin/classes/com/example/traffic/WifiStateReceiver.class
	bin/resources.ap_