changed package name and changed taget
Initial commit
undo previous action
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	README.md
resolved conflicts
resolved conflicts
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	RideShareBuddy/.DS_Store
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	RideShareBuddy/.DS_Store
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	RideShareBuddy/.DS_Store
start to create layout for change password
created layout for change password activity
created layout for change password activity
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	RideShareBuddy/bin/RideShareBuddy.apk
	RideShareBuddy/bin/classes.dex
	RideShareBuddy/bin/resources.ap_
	RideShareBuddy/src/com/objectlounge/ridesharebuddy/activities/ChangePasswordActivity.java
Created layout for change password

Conflicts:
	RideShareBuddy/bin/RideShareBuddy.apk
	RideShareBuddy/bin/classes.dex
	RideShareBuddy/bin/resources.ap_
	RideShareBuddy/src/com/objectlounge/ridesharebuddy/activities/ChangePasswordActivity.java
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid into beta

Conflicts:
	RideShareBuddy/bin/RideShareBuddy.apk
	RideShareBuddy/bin/classes.dex
	RideShareBuddy/bin/resources.ap_
Merge branch 'beta' of github.com:kalrav-obl/RideShareAndroid

Signed-off-by: Bhavesh Thakrar <bhavesht@objectlounge.com>

Conflicts:
	.DS_Store
	RideShareBuddy/.DS_Store
	RideShareBuddy/AndroidManifest.xml
	RideShareBuddy/bin/AndroidManifest.xml
	RideShareBuddy/bin/RideShareBuddy.apk
	RideShareBuddy/bin/classes.dex
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$dimen.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$drawable.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$id.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$layout.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$menu.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$string.class
	RideShareBuddy/bin/classes/com/objectlounge/ridesharebuddy/R$style.class
	RideShareBuddy/bin/resources.ap_
	RideShareBuddy/gen/com/objectlounge/ridesharebuddy/R.java
	RideShareBuddy/project.properties
	RideShareBuddy/res/.DS_Store
	RideShareBuddy/res/layout/.DS_Store
	RideShareBuddy/res/layout/login_activity.xml
	RideShareBuddy/res/values/strings.xml
	RideShareBuddy/res/values/styles.xml
	RideShareBuddy/src/com/objectlounge/ridesharebuddy/activities/LoginActivity.java
added code in loginActivity.java

Signed-off-by: Bhavesh Thakrar <bhavesht@objectlounge.com>