messing with gson
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project