MERGED CODE

merged code. Kept Hannar's code with my syntax (player instead of
Player). guys remember to keep syncing before you work on anything so
that you have the laters master branch code.