Merge with code.google.com; new file intro.txt (Introduction to MOTECH)
Merge branch 'master' of https://github.com/jinachan/motech-sphinxdocs

Conflicts:
	SphinxDocs/source/conf.py