servlet config
Merge pull request #7 from crhisnoriega/github/master

servlet config