Adding ling

Eg merging conflict
Merge branch 'master' of https://github.com/ariellav/project1

Conflicts:
	project1/gitnotes.md