Functional Version
Merge branch 'master' of https://github.com/ArmindoBC/AIAD1415