See how GIT works
Merge branch 'master' of github.com:LeiWangHoward/EECS340-proj2

Conflicts:
	src/core/tcp_module.cc