Attribute test
Strings
gitattrib
txt
att
test
Encoding change
Test
Sync
Merge remote-tracking branch 'upstream/master'

Conflicts:
	resource/Frota_english.txt
English resources restructure + NoBuying strings
English resource restructure + NoBuying strings
Merge pull request #74 from Cyborgmatt/master

English resource restructure + NoBuying strings