cylon tweak
Merge branch 'master' of https://github.com/Adalden/utw-hack-day