Lets start from here.
credit system done
merge conflict
Merge branch 'master' into brave