reformatting after talking edmund through it
hello china blogpost
Merge branch 'master' of github.com:johnlawrenceaspden/hobby-code

Conflicts:
	ring-wiki/datainsessionatom.clj
something about regexes