Edit the project plan
Merge branch 'master' of github.com:phyper/mobilefant-documentation

Conflicts:
	project plan/plan_template.pdf
	project plan/projectplan.tex