test .gitignore
Merge branch 'master' of https://github.com/sarahhung/CS149NetworkingSwarm

Conflicts:
	.viminfo