starting to sketch out docs
writing docs
continuing to scribble

Conflicts:
	war/WEB-INF/appengine-web.xml