Added gson
Merge branch 'master' of github.com:davidwan/CancerDog
Only saves trials when ending a session
Fixed merge conflicts