Poiet
Merge branch 'master' of https://github.com/jgoupgoup/projetNarc

Conflicts:
	ProjetMetro/intelligence/intelligence.cpp
Merge branch 'master' of https://github.com/jgoupgoup/projetNarc

Conflicts:
	ProjetMetro/beans/narc.cpp
	ProjetMetro/beans/narc.h
	ProjetMetro/intelligence/intelligence.cpp