Merge branch 'master' into sampleApp
assertions
Merge pull request #33 from Trott/sampleApp

Sample app