not sure
Merge branch 'master' of https://github.com/janitha000/TaxiSecurity

Conflicts:
	bin/TaxiSecurity.apk
	bin/classes.dex
	bin/classes/com/example/taxisecurity/Database_Handler.class
	bin/classes/com/example/taxisecurity/DisplayList$1$1.class
	bin/classes/com/example/taxisecurity/MainActivity.class
	bin/resources.ap_
	src/com/example/taxisecurity/Database_Handler.java
	src/com/example/taxisecurity/DisplayList.java
vindya commit