modified content
Merge branch 'master' of github.com:dnadesign/dnadesign.github.io

Conflicts:
	_posts/2013-08-10-dna-way.md