sns
Merge branch 'master' of https://github.com/sg3163/TwittTube

Conflicts:
	TwittTube/.classpath
	TwittTube/src/main/java/edu/columbia/servlets/VideoUploader.java