intial commit
Create README.md
removed small test area at the end of style.css
trying to workout merge conflicts