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

Conflicts:
	NobelPrize/gen/com/example/nobelprize/R.java
Merge branch 'master' of https://github.com/leonardomack/ift2905-projet-final

Conflicts:
	NobelPrize/src/com/example/nobelprize/TrueFalseGameActivity.java