Credit system added
fixed merge conflicts
Merge pull request #42 from meara/credit_system

Credit system