first commit

first commit
Merge branch 'master' of https://github.com/gtoubiana/syllabus

Conflicts:
	README.md
firs commit