Merge pull request #1 from thigambero/master

Update alunos.php
Update cursos.php
Update cursos.php
Merge branch 'pr/2'

Conflicts:
	cursos.php
Update cursos.php
Merge branch 'pr/2'

Conflicts:
	cursos.php
Merge branch 'master' of https://github.com/vitornovo/ubaduba

Conflicts:
	cursos.php
Resolvendo conflitos
Merge pull request #3 from vitornovo/master

aaa