synching
Merge branch 'master' of https://github.com/cs109/2014

Conflicts:
	.gitignore
	homework/HW0.ipynb