Checkpoint 2 rev4
Merge branch 'master' of https://github.com/Tujurikkuja/tw-challenge-2014