last
a
Merge branch 'emerson' into test

Conflicts:
	Musicando.xcodeproj/project.pbxproj
	Musicando/Mod1Aula1Exe1ViewController.m
	Musicando/Mod1Aula1Exe1ViewController.xib
atu
paraMerge
Merge branch 'emerson' into test

Conflicts:
	.gitignore
	Musicando.xcodeproj/project.pbxproj
	Musicando/Imagens/tocaTreco.png
	Musicando/Mod1Aula1Exe1ViewController.m
	Musicando/Mod1Aula2Exe1ViewController.m
	Musicando/Mod1Aula2Exe1ViewController.xib