delete
hello world
Merge branch 'master' of https://github.com/43dos/43dos.github.io

Conflicts:
	_posts/2012-12-10-tech_die-e-mail-lebt.md

_posts/2014-02-28-02-24-27_tech_whatsapp-der-nutzer-ist-ein-armer-wurm.m
d