master merged
Merge branch 'master' of github.com:kms617/toy
Merge branch 'master' of github.com:kms617/toy
haskrockets killed