Merge pull request #1030 from bdonald25/bdtemp

fix merge conflics with datawalk
Merge pull request #1031 from bdonald25/bdtemp

Fixed 5 minor bugs that were found from testing pictures app and datawalk
Merge pull request #1032 from bdonald25/bdtemp

Added rides to Canobie app
Merge pull request #1033 from bdonald25/bdtemp

help menu added for canobie physics
added help menu and about menu for pictures app