Adds a new hair, Curly (yeah not really that curly but still)
Added myself to admins.txt for testing.
Curly fixed, cripples added.
2 new disability types, and fixes curly hair again.
Modification of .gitignore to include admins.txt. Hopefully.`
Merge branch 'srsbsns'
Fucking finally figuring out how to make admins.txt be ignored.
bluh
Merge branch 'master' into srsbsns
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt
Merge branch 'master' into srsbsns
stuff
Merge branch 'master' into srsbsns
Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' into srsbsns
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt
Merge branch 'master' into srsbsns
Merge branch 'master' of https://github.com/tgstation/-tg-station

Conflicts:
	config/admins.txt
Merge branch 'master' into srsbsns
Long bangs from disability PR.