added gson to proxy class
merging
added junit test to get player cookie started
Merge branch 'master' of https://github.com/cameronmccord2/cs340