initial commit
create a new test file
removed testfile accidentally pushed
added markdown to readme
added markdown to readme
styles
Resolve merge conflict