CU-600
Merge branch 'master' of https://github.com/ronnysuero/INF-522_A2