first commit.
Merge branch 'master' of https://github.com/trkw/trkw.github.io

Conflicts:
	.gitignore
	_config.yml