add riot show
fix merge conflict
Merge pull request #6 from scit106/riot

add riot show
Merge pull request #7 from scit106/master

riot show