Merge origin/master

Conflicts:
	.gitignore
	nbproject/UPDATED.TXT
Merge origin/master

Conflicts:
	src/spacetraders/NewGameController.java