addendum
Merge branch 'markup' of github.com:toumorokoshi/toumorokoshi.github.com into markup

Conflicts:
	content/programming/python/dry-through-decorators.rst
Merge branch 'markup' of github.com:toumorokoshi/toumorokoshi.github.com into markup
Added more notes about python internals