Merge branch 'master' into sampleApp
add Travis badge
Merge pull request #37 from Trott/sampleApp

Sample app