Merge pull request #4 from danholevoet/master

Refactors Greeting class and removes use of ID tokens