README merged
new file nonsense
modified readme for practicing merge