Merge pull request #30 from Magenic/master

Merging into my local fork.
Fixing issue #105
Merge branch 'master' of https://github.com/jwendl/Badge-Application
Merge pull request #108 from jwendl/master

Fixing bug with missing employee name.