update code.cpp
Merge branch 'master' of https://github.com/tracicot/TeamTubularsRepo

merged changes
conflict?
end conflict