reboot
Merge branch 'master' of github.com:t-carvalho/erlang

Conflicts:
	.gitignore
	exercicios/00-helloworld/hello.erl
	exercicios/01-lists/elists.erl