MAKE ALL THE ASSUMPTIONS
Merge branch 'master' of github.com:amakelov/cs229

Conflicts:
	paper-draft/draft.tex