undo a mess up
Merge branch 'master' of github.com:stanri/kswak