Updates...
Merge branch 'master' of https://github.com/cabouffard/IMN428---TP4

Conflicts:
	Content/MacOS/IMN428-TP4/IMN428-TP4/main.cpp
	Content/Windows/IMN428-TP4/IMN428-TP4/IMN428-TP4.vcxproj
	Content/Windows/IMN428-TP4/IMN428-TP4/IMN428-TP4.vcxproj.filters