fix for tomcat setup
Merge branch 'master' of https://github.com/jtestard/CSE135prep