Merge remote-tracking branch 'origin/master' into Hardware-1
Update of BOM for 1v1 Still needs more work
Merge remote-tracking branch 'origin/Hardware-1' into Hardware-2