Merge pull request #5 from pauloesantos/exe01

exe01
Merge pull request #6 from pauloesantos/exe01

Exe01
em casa 2

em casa 2
Merge pull request #7 from pauloesantos/exe01

em casa 1
Merge pull request #8 from pauloesantos/exe01

Exe01
Merge pull request #9 from pauloesantos/exe01

ntalk trabalho 08/07
Merge pull request #10 from pauloesantos/exe01

Acertando pastas do exemplo
Merge pull request #11 from pauloesantos/exe01

Exe01
Merge pull request #12 from pauloesantos/exe01

ttttt
usuario e sessões

5.2 - Usuarios e sessões
comm
Merge remote-tracking branch 'origin/master'

Conflicts:
	ntalk/controllers/home.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	ntalk/controllers/home.js
eeeeee
Merge remote-tracking branch 'origin/exe01'

Conflicts:
	ntalk/controllers/home.js
Merge pull request #14 from pauloesantos/master

tentando rebase master