Resoleved conflict in merge
Merge branch 'combining_of_2_versions' of https://github.com/jreinholm/TimelapsePlus-Firmware into combining_of_2_versions