messy crap
Merge branch 'test' of https://github.com/sz-cs130/seo-tool-team2 into test

Conflicts:
	webapp/src/main/webapp/WebApp.java
Skeleton works and deploys on Jetty, woot woot