add transition
Merge branch 'master' of github.com:calfjohn/StbProject
Merge pull request #10 from encal/master

Merge code
merge yike
Merge pull request #11 from Ryeeeeee/master

add transition
complete demo flow