Initial Commit
Merge https://github.com/ED2-2013/Trabalho_1_Bim