update draft
Merge remote-tracking branch 'origin/master'

Conflicts:
	_drafts/scala/2014-01-07-programming_scala_venkat_subramaniam.md