madskristensen/MiniBlog — pull request #27 by Gordon-Beeming (2013-10-19 21:16:40+00:00)
Title: Edit categories

This shouldn't conflict, still new to Git