ticket:1 Tests
Merge branch 'master' of https://github.com/wussup/42coffeecups
ticket:1 Almost done