Agregue Vistas RateMyPet y PetMatch
Edité conflictos generados al intentar hacer Merge con Original
Edité conflictos generados al intentar hacer Merge con Original
Merge remote-tracking branch 'upstream/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Pawhub_PetMatch.apk
	bin/classes.dex
	bin/classes/com/blastic/pawhub_petmatch/R$drawable.class
	bin/classes/com/blastic/pawhub_petmatch/R$id.class
	bin/classes/com/blastic/pawhub_petmatch/R$layout.class
	bin/classes/com/blastic/pawhub_petmatch/R$menu.class
	bin/classes/com/blastic/pawhub_petmatch/R$string.class
	bin/classes/com/blastic/pawhub_petmatch/R$style.class
	bin/classes/com/blastic/pawhub_petmatch/RateMyPetActivity.class
	bin/resources.ap_
	gen/com/blastic/pawhub_petmatch/R.java
	res/layout/activity_login.xml
	res/layout/activity_rate_my_pet.xml
	res/values/strings.xml
Merge pull request #3 from imarban/master

Agregue Vista de Petmacth y RateMyPet