aiofneia
Merge branch 'lab1' of https://github.com/michelleoj/6.858-lab-2014 into lab1

Conflicts:
	exploit-3.py
	shellcode.S