merged new show method
Merge branch 'master' into priorites
Merge pull request #6 from euglazer/priorites

Priorites