Working serialization
Merge remote-tracking branch 'origin/master'

Conflicts:
	Brave-Pirate/main.cpp