start from here
updating tone
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from therewasaguy/master

updating tone
make shapes last for a while
Merge branch 'master' of github.com:karenpeng/yayaya