Merge branch 'master' into sampleApp
add Travis integration
update comment
Merge pull request #36 from Trott/sampleApp

Sample app