updates
Merge branch 'master' of https://github.com/sapamja/pyFQA

Conflicts:
	about_python/faq1