hi
Merge branch 'master' of github.com:oraac/ewu-cscd540

Conflicts:
	makefile
hi
Merge branch 'master' of github.com:oraac/ewu-cscd540

Conflicts:
	Makefile
hi
k
Merge branch 'master' of github.com:oraac/ewu-cscd540

Conflicts:
	Makefile