-u, -t, and -rr
Merge branch 'master' of https://github.com/jordanywhite/cs376Proj

Conflicts:
	main.c
	makefile
Merge branch 'master' of https://github.com/jordanywhite/cs376Proj

Conflicts:
	myData.txt