adding categories.
Merge branch 'source' of https://github.com/charlesreid1/charlesreid1.github.io into source

Conflicts:
	source/_posts/_2014-08-06-pantera-a-toolbox-for-cantera-in-python.markdown