Merge pull request #627 from luixxiul/development

Development
Merge pull request #628 from luixxiul/development

Development
Merge pull request #629 from luixxiul/development

ad changed
ad changed
Merge branch 'development' of https://github.com/luixxiul/luixxiul.github.io into development

Conflicts:
	atom.xml
	fastphilosophy/index.html
	map/index.html
ad