edit README
edit README to conflict
edit README with Pink Floyd allusion
merged two versions of README
edit .gitignore to ignore temp file
Edited two files for testing
My first edit
update README
Merge branch 'develop' into feature/Chris
Merge branch 'develop' into feature/Ryan
Merge branch 'feature/Chris' into feature/Ryan
random changes
Merge branch 'feature/Chris' of https://github.com/tindrum/data_logger into feature/Chris
add argv parsing
random stuff
Merge branch 'develop' of https://github.com/tindrum/data_logger into feature/Chris
working main with passed arguments
Merge branch 'develop' of https://github.com/tindrum/data_logger into feature/Chris
add newline to cout in main
Remove 64bit compile from the Makefile