Passes testCase 4
Merge branch 'dev' of github.com:INSA-4IF-H4404-2013-2014/CognitiveModeling into dev