Changed it so that the code for class choice and newly added race choice are in another file.

I added a few more comments
Merge remote-tracking branch 'origin/master'