add code climate badge
merge master and resolve conflict