Merge pull request #1089 from bdonald25/master

Fix merge conflict and git ignore removed files specific to the ide that were not necessary to sync with git
fixed menu datawalk
Merge pull request #1090 from bdonald25/bdTemp

fixed menu datawalk
starting working on automated testing
Merge pull request #1091 from jdaigneau/master

starting working on automated testing
car ramp test project
gitignore changes
Merge pull request #1092 from jdaigneau/master

car ramp test project
Merge remote-tracking branch 'upstream/master' into bdTemp
removed unused code from datawalk
fixed reset on datawalk
Merge pull request #1093 from bdonald25/bdTemp

Reset button in datawalk now works