juhuuu
Merge branch 'master' of https://github.com/Catpaw42/Area51.git

Conflicts:
	Matador/src/game/TradeController.java