bulleted list is better than ordered here
Merge branch 'master' of github.com:badgerman/twigtechnology-source

Conflicts:
	_posts/2013-09-20-atlas-postmortem.markdown
beautificaton