added a few articles, added media
Merge branch 'master' of github.com:chaospott/site
resized pictures
Merge branch 'master' of github.com:chaospott/site

Conflicts:
	_posts/2014-07-04-cryptoparty.markdown
	css/style.css
Merge branch 'master' of github.com:chaospott/site