what
Merge branch 'master' of https://github.com/luzerno/cs420jhu

Conflicts:
	ompsmooth/smooth.c