working on gson
wroking on transporter

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

Conflicts:
	game_client/Transporter.class
Merge branch 'master' of https://github.com/JoshuaDickerson/cs205-Final_Project