added tests
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
lots of stuff
Merge branch 'master' of https://github.com/pm489/hackathon

Conflicts:
	Web/test/ServletTest.java