testing conflict stuff
Merge branch 'master' of
ssh://git@github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/MainActivity.class