Intro into github
Made some modifications
Merge branch 'stopyoukid-feature' of https://github.com/stopyoukid/example-basic into stopyoukid-feature