First commit of proj1 for cs61a summer 2013
Merge branch 'master' of https://github.com/jasonaibrahim/cs61a

Conflicts:
	proj1/__pycache__/dice.cpython-33.pyc
	proj1/__pycache__/hog.cpython-32.pyc
	proj1/__pycache__/hog.cpython-33.pyc
	proj1/__pycache__/ucb.cpython-33.pyc
Merge branch 'master' of https://github.com/jasonaibrahim/cs61a
hw3 final