deploy: added updated cs462.war and updated the deploy_war script
Merge branch 'deploy' of http://github.com/kevinblack100/cs462 into deploy
launch: updated setup_tomcat to correctly execute the config_tomcat script