first commit
this the last commit, will be merged into the new serviceman.github.io
Merge remote-tracking branch 'finish/master' which was the test site used to get grip with jekyll

Conflicts:
	.gitignore
	_config.yml
	_includes/css/base.css
	_includes/css/screen.css
	_includes/footer.html
	_includes/sidebar.html
	_layouts/default.html
	_layouts/post.html
	assets/css/all.css