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

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/Animallist.class
	gen/com/example/northamericanwildlifesounds/R.java
Merge branch 'master' of
ssh://git@github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/R$id.class
	bin/classes/com/example/northamericanwildlifesounds/R$layout.class
	bin/classes/com/example/northamericanwildlifesounds/R$menu.class
	bin/classes/com/example/northamericanwildlifesounds/R$raw.class
	bin/classes/com/example/northamericanwildlifesounds/R$string.class
	bin/classes/com/example/northamericanwildlifesounds/R$style.class
	gen/com/example/northamericanwildlifesounds/R.java
Merge branch 'master' of
ssh://git@github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/Game.class
Merge branch 'master' of https://github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git
Merge branch 'master' of
https://github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/NorthAmericanWildlifeSounds.apk
	bin/classes.dex
	bin/resources.ap_
Converted current mp3s to ogg format for soundpool compatability
Changing current sound files from mp3 to ogg for soundpool
compatibility.