Merge pull request #3 from dn63/master

test merge
Create upstream_update.test
Merge pull request #1 from bruinrobotics/master

test2