MCG
Merge branch 'master' of https://github.com/leonardomack/ift2905-projet-final

Conflicts:
	NobelPrize/src/com/example/nobelobjects/MultipleChoiceQuestion.java