Git Ignore added, String Array for state city and neighborhood
Merge branch 'oscar' into developer

Conflicts:
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$attr.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$dimen.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$drawable.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$id.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$layout.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$menu.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$string.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/R$style.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/activities/LoginActivity.class
	WeMake/bin/classes/co/gov/wemake/wemakeapp/activities/RegisterActivity.class
	WeMake/gen/co/gov/wemake/wemakeapp/R.java
	WeMake/res/layout/activity_register_part_two.xml
	WeMake/res/values/neighborhood_array.xml
Merge
Manifest update
Merge remote-tracking branch 'origin/developer' into developer

Conflicts:
	WeMake/bin/AndroidManifest.xml