Still experimenting 
Merge branch 'master' of https://github.com/wiinci/wiinci.github.com

Conflicts:
	.gitignore
	_config.yml
	_includes/header.html
	_includes/meta.html
	_includes/scripts.html
	_layouts/default.html