story done
Merge branch 'master' of github.com:addtheletters/TSA2014
things and stuff