Delete upstream_update.test
Delete merge.test
Merge pull request #4 from dn63/master

Merge pull request #1 from bruinrobotics/master
Merge pull request #2 from bruinrobotics/master

update