woooooo
Merge branch 'master' of https://github.com/bike2ski/cs376Proj

Conflicts:
	main.c
	makefile