My dogs, Dog Builder
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/dtran/plentyofdog/DatabaseHelper.java
	app/src/main/java/com/example/dtran/plentyofdog/DogBreedHelper.java