update content and style

update content and style
Merge branch 'master' of https://github.com/ZanderDev/ZanderDev.github.io

Conflicts:
	_config.yml