escape menu
Merge branch 'master' of github.com:addtheletters/TSA2014
b/c stuff