Fin de la recherche.

Signed-off-by: Gaetan <gaetan.eyheramono@gmail.com>
Ignore list

Signed-off-by: Gaetan <gaetan.eyheramono@gmail.com>
Merge branch 'master' of https://github.com/ThomasMarques/Csharp

Conflicts:
	DataAccessLayer/EventsAgenda.mdf
	DataAccessLayer/EventsAgenda_log.ldf
	WebSiteAgenda/Main.Master
	WebSiteAgenda/Service References/WcfServiceAgenda/Reference.cs
	WebSiteAgenda/Service References/WcfServiceAgenda/ServiceAgenda.wsdl
	WebSiteAgenda/Service References/WcfServiceAgenda/ServiceAgenda1.xsd
	WebSiteAgenda/WebSiteAgenda.csproj
	WebSiteAgenda/reservation.aspx

Signed-off-by: Gaetan <gaetan.eyheramono@gmail.com>
Merge branch 'master' of https://github.com/ThomasMarques/Csharp