ripped out thesis garbage
Merge branch 'master' of https://github.com/darkdigitaldream/Typhoon