Added frostivus english file for testing
Merge pull request #68 from Cyborgmatt/master

English resource file fix
Merge pull request #69 from Cyborgmatt/master

English resource diff test
Merge pull request #70 from Cyborgmatt/master

English is hard
Updated the gamemodes section of readme.md
Pushed latest english :(
Merge branch 'master' of https://github.com/ash47/Frota

Conflicts:
	resource/Frota_english.txt
Merge pull request #71 from Atharv24/patch-1

Updated the gamemodes section of readme.md
Merge remote-tracking branch 'upstream/master'

Conflicts:
	resource/Frota_english.txt