Badges in README
merged conflicts