Q2
Merge branch 'master' of https://github.com/SINF1121GR9/2013-2014

Conflicts:
	mission6/MST/rapport/main.pdf
	mission6/MST/rapport/main.tex