new
Merge branch 'master' of github.com:Aeropig/aeropig.github.com

Conflicts:
	_config.yml
	_config.yml~
	_includes/comments.md~
	_layouts/default.html
	_layouts/page.html
	_layouts/post.html
	about/index.md
	feed/index.html
	links/index.md
	media/css/style.css
	media/js/jquery-1.7.1.min.js