dded post
fixed conflict
Conflicts:
	2013/05/28/man-of-steel-getting-up-to-speed/index.php