transfer stuff
Merge branch 'master' of github.com:taivop/tw-challenge-2014