added new file
Merge branch 'master' of https://github.com/ocampesato/test1

Conflicts:
	notes.txt