adding tomcat
Merge branch 'master' of github.com:gvauter/tomcat