next..
Merge branch 'master' of github.com:xamino/project_mci_proposal

Conflicts:
	sources.bib