Merge branch 'master' of https://github.com/emecas/My-Notes

Conflicts:
	Index.txt
cc