Do something
Merge branch 'master' of https://github.com/Machine-Learning-UCSD-Course-Projects/Assignments

Conflicts:
	Assignment 2/computeE.m