Merge branch 'master' of https://github.com/dreddi/CySCA2014

Conflicts:
	files/crypt01_standard-galactic-alphabet.py
	files/crypt02_compression-session.py
	files/exp01_the-fonz
	files/exp01_the-fonz.c
	files/exp02_matt-matt-matt-matt
	files/exp02_matt-matt-matt-matt.c
	files/exp03-_a-bit-one-sided.cpp
	files/exp03_a-bit-one-sided
	files/goldfish-2.6.29.zip
	files/net01_not-enough-magic.pcap
	files/net02_notwork-forensics.pcap
	files/net03_aybabtu.pcap
	files/prog01_jeremys-iron.py
	files/rand01_pulp-fiction
	files/rand02_spanish-trout.c
	files/rand03_reed-between-the-lines.jpg
	files/re01_u-jad-bro.jar
	files/re02_port-knocking
	files/re03_forever-alone
	files/sc03_stop-rop-and-roll
Merge branch 'master' of https://github.com/dreddi/CySCA2014

Conflicts:
	files/exp03-_a-bit-one-sided.cpp
	files/exp03.cpp
	files/exp03_a-bit-one-sided.cpp