add blog post for paris 2013
Merge remote-tracking branch 'upstream/master'

Conflicts:
	site/content/blog/2013/03/08/dod-paris-2013/index.txt
merge
add Rude Baguette as media sponsor for Paris 2013
Merge pull request #143 from phrawzty/master

add RB as media sponsor for Paris 2013