Fixing broken commits
Merge branch 'master' of https://github.com/adamhsparks/MICORDEA

Conflicts:
	LaTeX/Duku et al.tex