no
Merge branch 'master' of
https://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
https://github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git

Conflicts:
	bin/classes/com/example/northamericanwildlifesounds/R$id.class
	gen/com/example/northamericanwildlifesounds/R.java
Merge branch 'master' of https://github.com/LucasMeloPessoa/NorthAmericanWildlifeSounds.git
Adding text dimensions for main screen