fixing conflict
Merge branch 'gh-pages' of git://github.com/killfall/asteroid-prospector
added French translation
updated language credits
Merge branch 'KEWilliams-master' into gh-pages