rewritten, cc
Merge branch 'development' of https://github.com/luixxiul/luixxiul.github.io into development

Conflicts:
	atom.xml
hegel rewritten+image added, a8->ga, cc