Dodging merge conflicts
Merge remote-tracking branch 'upstream/master' into jp508
Duck, it's another conflict
Just dodged another merge conflict
Merge remote-tracking branch 'upstream/master' into jp508
Added data saving to manual -- to be tested
Merge remote-tracking branch 'upstream/master' into jp508
Merge pull request #629 from jaypoulz/jp508

Jp508 -- Potentially finished added data saving to manual