blah

Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	res/changeableInfo.txt
Merge branch 'master' of https://github.com/Maestro1337/ssha.git
Fixed description for firestorm.
Merge branch 'master' of https://github.com/Maestro1337/ssha.git

Conflicts:
	res/changeableInfo.txt
Merge branch 'master' of https://github.com/Maestro1337/ssha.git