section project description
Merge remote-tracking branch 'origin/master'

Conflicts:
	project-plan/project-plan.tex