modified git ignore
Merge branch 'master' of https://github.com/Rrego6/space_traders into raoul
Merge branch 'master' of https://github.com/Rrego6/space_traders into raoul
Added gson library