initial commit
added DeleteMe
added DeleteMe and some random text
Merge branch 'master' into newFeature
resolved merge conflict