5 Commits

Author	SHA1	Message	Date
Timm Szigat	0580a3851e	Merge branch 'master' of github.com:chaospott/site ... Conflicts: _posts/2014-07-04-cryptoparty.markdown css/style.css	2014-10-26 23:48:43 +01:00
Timm Szigat	3b20b2e6a4	resized pictures	2014-10-26 23:43:30 +01:00
Timm Szigat	bf6537ef5d	added a few articles, added media	2014-10-26 19:35:05 +01:00
Timm Szigat	b4415b675e	Design and Jekyll added	2014-10-26 14:11:10 +01:00
Timm Szigat	3c565f0574	Design and Jekyll added	2014-10-26 14:11:10 +01:00