first test of merging edits

Edited a bit in intro, just to test the merging process in Github.