Merge branch 'master' of https://github.com/abertrand13/Electronics-Rocks

Conflicts:
AccelerationTesting/MERGE_TEST_MASTER/MERGE_TEST_MASTER.ino
Fixing the conflict (testing)