first import
Merge branch 'master' of github.com:torquebox/rubygems-servlets

Conflicts:
	.gitignore