Shang-Tsung.
Merge branch 'master' of github.com:WillianJunior/ProjetoSO

Conflicts:
	ProjetoSO/so_submit.c
Sub-zero.
Merge branch 'master' of github.com:WillianJunior/ProjetoSO

Conflicts:
	ProjetoSO/so_submit.c