Fixed get bug
Removed @TODO
Made it look nice
Merge branch 'master' of https://github.com/erikmp/Dwa-P2

Made it look nice