Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
Merge origin/master

Conflicts:
	score.ser
Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	score.ser