add badge to readme
fix merge conflicts
Merge pull request #6 from ozayyad/nataliemac81

add badge to readme