here we go; stealing ideas from githubs
Merge branch 'master' into secure-proxy-like-github-atmos-camo
Merge pull request #12 from steder/secure-proxy-like-github-atmos-camo

here we go; stealing ideas from githubs
Merge branch 'master' into placeholders

Conflicts:
	giraffe.py