Updated Character and Player classes
Updated Character Class
Merge remote-tracking branch 'origin/master'