modified:   _config.yml
	modified:   _posts/2013-12-15-welcome-to-jekyll.markdown
	deleted:    _posts/2014-01-07-tog-linux-class1.ext
	deleted:    a-draft-post.md
	modified:   about.md
	deleted:    site.tar.gz
	_config.yml~
	_drafts/2013-12-15-this-is-a-draft.markdown
	_drafts/2013-12-15-this-is-a-draft.markdown~
	_posts/2013-12-15-welcome-to-jekyll.markdown~
	_posts/2014-01-07-tog-linux-class1.md
	_posts/2014-01-07-tog-linux-class1.md~
	about.md~
	new file:   _config.yml~
	new file:   _drafts/2013-12-15-this-is-a-draft.markdown
	new file:   _drafts/2013-12-15-this-is-a-draft.markdown~
	new file:   _posts/2013-12-15-welcome-to-jekyll.markdown~
	new file:   _posts/2014-01-07-tog-linux-class1.md
	new file:   _posts/2014-01-07-tog-linux-class1.md~
	new file:   about.md~
Merge branch 'master' of https://github.com/padraic7a/thisblog

I think this is because I altered a file on github