primeiro commit na branch venancio
commit1

commit1
coomiii

commo
commit 3

commit3
Initial commit
commit 4
commit 3
commmit inicial

a partir daqui cada alteracao sera uma nova branc
comiit 3
Merge remote-tracking branch 'origin/venancio'

Conflicts:
	EscalaMob/bin/EscalaMob.apk
	EscalaMob/bin/classes/.gitignore
	EscalaMob/bin/dexedLibs/android-support-v4-ad5414776f64fa73107cc9a5e04893d9.jar
	EscalaMob/bin/resources.ap_
	EscalaMob/gen/.gitignore