fixes infufg/sade#36
Merge pull request #37 from kuninory/master

fixes infufg/sade#26
Merge pull request #38 from serrgio/master

fixes infufg/sade#36
fixes infufg/sade#17
Merge branch 'master' of https://github.com/infufg/SADE
fixes infufg/sade#40
fixes infufg/SADE#39
Merge pull request #41 from serrgio/master

fixes infufg/sade#40
Merge pull request #42 from jullianonascimento/master

fixes infufg/SADE#17
Merge pull request #43 from luizhenriquees/master

fixes infufg/SADE#39
fixes infufg/sade#18
fixes infufg/sade#18

adiciona nota sobre escala da prioridade
Merge pull request #44 from blessedguy/master

fixes infufg/sade#18
Atualiza .gitignore

Templates adicionados ao gitignore: OS X, Windows, JetBrains, NetBeans, Eclipse
fixes infufg/sade#47
Merge pull request #52 from blessedguy/master

fixes infufg/sade#47
fixes infufg/SADE#49
resolve conflito
Merge pull request #53 from luizhenriquees/master

fixes infufg/SADE#49
fixes infufg/sade#46