Including some PT-BR stuff
Merge branch 'master' of github.com:jmcunningham/AngularJS-Learning
Merge branch 'master' of github.com:cironunes/AngularJS-Learning

Conflicts:
	README.md
Update PT-BR.md
Merge branch 'master' of github.com:jmcunningham/AngularJS-Learning
Merge remote-tracking branch 'local/master'
Reverse wrong merge
Merge branch 'wrong-merge'
Merge pull request #12 from cironunes/pt-br

Including more PT-BR stuff