silliness
Merge branch 'master' of https://github.com/dspeyer/Niki
Merge branch 'master' of https://github.com/dspeyer/Niki

Conflicts:
	hw2_team13.m
Merge branch 'master' of https://github.com/dspeyer/Niki