threadfixing
Merge branch 'master' of github.com:kayson/talespin
clogo
zoomfix
conflict fix