Merge branch 'master' of https://github.com/d3vc0r3/d3vc0r3.github.io

Conflicts:
	atom.xml
	rss.xml