Add Caroline's New Command Line Post
"Merge all new commits"
Merge pull request #2 from silshack/gh-pages

Updating Caroline's repository
"Add changes to people file"
Merge branch 'gh-pages' of http://github.com/carolinp/fall2013 into gh-pages

Conflicts:
	_site/2013/10/14/Carolines-Fun-Command-Line-Post.html
	_site/index.html
	_site/people.html
	_site/post/2013/09/18/Carolines-CodingBat-Screenshot.html
Delete the _site folder
Edit my new post to describe the command line process
Merge pull request #396 from carolinp/gh-pages

Create Caroline's Shiny, Finished New Command Line Post