Problem 3 and updates
git commit
Merge branch 'master' of https://github.com/nyucusp/gx5003-fall2013

Conflicts:
	ajm777/assignment3/problem4.py
	jsa325/assignment3/problem3.py