Classes added, but won't compile
updated dog
Added my version of dog
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
Merge branch 'master' of github.com:jetav8r/android-source

Conflicts:
	milestone_01_java/00_oop/classes/src/com/bloc/classes/Dog.java
new dog.class