Commit before Pulling from Ankit
Merge branch 'master' of https://github.com/ankuchheda/VIrtualCardWallet

Conflicts:
	bin/MyVirtualCardWallet.apk
	bin/classes.dex
	bin/classes/com/example/myvirtualcardwallet/DetailView$1.class
	bin/classes/com/example/myvirtualcardwallet/DetailView.class
	bin/classes/com/example/myvirtualcardwallet/Edit_card$1$1.class
	bin/classes/com/example/myvirtualcardwallet/Edit_card$1.class
	bin/classes/com/example/myvirtualcardwallet/Edit_card$2.class
	bin/classes/com/example/myvirtualcardwallet/Edit_card.class
	bin/classes/com/example/myvirtualcardwallet/ListCardsActivity.class
	bin/classes/com/example/myvirtualcardwallet/LoginActivity$1.class
	bin/classes/com/example/myvirtualcardwallet/LoginActivity$UserLoginTask.class
	bin/classes/com/example/myvirtualcardwallet/LoginActivity.class
	bin/classes/com/example/myvirtualcardwallet/MakeCard.class
	bin/classes/com/example/myvirtualcardwallet/Options.class
	bin/classes/com/example/myvirtualcardwallet/R$id.class
	bin/classes/com/example/myvirtualcardwallet/R$layout.class
	bin/classes/com/example/myvirtualcardwallet/R$menu.class
	bin/classes/com/example/myvirtualcardwallet/R$string.class
	bin/classes/com/example/myvirtualcardwallet/R$style.class
	bin/classes/com/example/myvirtualcardwallet/R$styleable.class
	bin/classes/com/example/myvirtualcardwallet/SignUpActivity$1.class
	bin/classes/com/example/myvirtualcardwallet/SignUpActivity.class
	bin/resources.ap_
	gen/com/example/myvirtualcardwallet/R.java
	res/values/strings.xml