Careermap Template
Something
Merge branch 'master' of https://github.com/htootsi/htootsi.github.io

Conflicts:
	_config.yml
	_posts/articles/2013-07-15-blog-test.md
	_site/2014/Hello-World/index.html
	_site/2014/blog-pos copy 10/index.html
	_site/2014/blog-pos copy 11/index.html
	_site/2014/blog-pos copy 12/index.html
	_site/2014/blog-pos copy 13/index.html
	_site/2014/blog-pos copy 14/index.html
	_site/2014/blog-pos copy 15/index.html
	_site/2014/blog-pos copy 16/index.html
	_site/2014/blog-pos copy 17/index.html
	_site/2014/blog-pos copy 18/index.html
	_site/2014/blog-pos copy 19/index.html
	_site/2014/blog-pos copy 2/index.html
	_site/2014/blog-pos copy 3/index.html
	_site/2014/blog-pos copy 4/index.html
	_site/2014/blog-pos copy 5/index.html
	_site/2014/blog-pos copy 6/index.html
	_site/2014/blog-pos copy 7/index.html
	_site/2014/blog-pos copy 8/index.html
	_site/2014/blog-pos copy 9/index.html
	_site/2014/blog-pos copy/index.html
	_site/2014/blog-pos2 copy 2/index.html
	_site/2014/blog-pos2 copy 3/index.html
	_site/2014/blog-pos2/index.html
	_site/2014/blog-post1/index.html
	_site/2014/blog-test/index.html
	_site/2014/here-to-learn/index.html
	_site/about/index.html
	_site/articles/index.html
	_site/index.html
	_site/misc/index.html
	_site/page2/index.html
	_site/page3/index.html
	_site/page4/index.html
	_site/page5/index.html
	_site/page6/index.html
	_site/thoughts/index.html