decision and display logic
Merge pull request #4 from davidamoen/develop

decision and display logic