Retesting how git from home
Changed stuff
Merge branch 'develop' of https://github.com/tindrum/data_logger into feature/Ryan

Conflicts:
	README.md
few changes made to lineparser and main_loop
Merge with Daniels branch