some changes
Merge branch 'master' of https://github.com/looooo/FCGear

Conflicts:
	README.md
nix