final
Merge branch 'MASTER_2_MIAGE_NTPD' of https://github.com/MohammedAmine/WEB2_RABAT_2015_DHAIM_ELJIRARI into MASTER_2_MIAGE_NTPD

Conflicts:
	Sources/Version 1/script.js