Various updates
Merge branch 'master' of https://github.com/melnicki/melnicki.github.io

Conflicts:
	_config.yml
	css/styles.css
	index.html