failed
Merge branch 'master' of
ssh://git@github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/MainActivity.class
	src/com/example/northamericanwildlifesounds/MainActivity.java
david overrides all
david merge