Uncommited changes from 220A
Merge branch 'master' of https://github.com/roshanvid/stanford

Conflicts:
	MUSIC220A/hw5/amplitudeFrequencyTracker.ck