Merge pull request #1 from wesleyolis/newfeat

dummy
Added ignore list
Merge branch 'master' of github.com:wesleyolis/erlang
creating merge conflict
Testing branches on linux