merged comment
Merge branch 'master' of github.com:recuraki/PythonJunkScript

Conflicts:
	WebMemo/webmemo.py